------------------------------------------------------------ revno: 117381 committer: Glenn Morris branch nick: trunk timestamp: Sun 2014-06-22 23:43:20 -0700 message: Misc small doc/ Makefile cleanup * emacs/Makefile.in (mkinfodir): Remove. (.dvi.ps): Replace with pattern rule. (${buildinfodir}): New rule. ($(buildinfodir)/emacs.info): Use order-only prereq for output dir. Use $<. (emacs.dvi, emacs.pdf, emacs.html, emacs-xtra.dvi, emacs-xtra.pdf): Use $<. (%.ps): New rule. * lispintro/Makefile.in (mkinfodir): Remove. (.dvi.ps): Replace with explicit rule. (${buildinfodir}): New rule. (${buildinfodir}/eintr.info): Use order-only prereq for output dir. Use $<. (emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $<. (emacs-lisp-intro.ps): New rule. * lispref/Makefile.in (mkinfodir): Remove. (.dvi.ps): Replace with explicit rule. (html): Declare as PHONY. (${buildinfodir}): New rule. ($(buildinfodir)/elisp.info): Use order-only prereq for output dir. Use $<. (elisp.dvi, elisp.html, elisp.pdf): Use $<. (elisp.ps): New rule. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-06-23 06:25:47 +0000 +++ doc/emacs/ChangeLog 2014-06-23 06:43:20 +0000 @@ -1,6 +1,14 @@ 2014-06-23 Glenn Morris * Makefile.in (%.texi): Disable implicit rules. + (mkinfodir): Remove. + (.dvi.ps): Replace with pattern rule. + (${buildinfodir}): New rule. + ($(buildinfodir)/emacs.info): Use order-only prereq for output dir. + Use $<. + (emacs.dvi, emacs.pdf, emacs.html, emacs-xtra.dvi, emacs-xtra.pdf): + Use $<. + (%.ps): New rule. 2014-06-15 Glenn Morris === modified file 'doc/emacs/Makefile.in' --- doc/emacs/Makefile.in 2014-06-23 06:25:47 +0000 +++ doc/emacs/Makefile.in 2014-06-23 06:43:20 +0000 @@ -142,47 +142,44 @@ ${srcdir}/kmacro.texi \ $(EMACS_XTRA) -## The info/ directory exists in release tarfiles but not the repository. -mkinfodir = @${MKDIR_P} ${buildinfodir} - ## Disable implicit rules. %.texi: ; .PHONY: info dvi html pdf ps -.SUFFIXES: .ps .dvi - -.dvi.ps: - $(DVIPS) -o $@ $< - info: $(buildinfodir)/emacs.info dvi: $(DVI_TARGETS) html: $(HTML_TARGETS) pdf: $(PDF_TARGETS) ps: $(PS_TARGETS) +## The info/ directory exists in release tarfiles but not the repository. +${buildinfodir}: + ${MKDIR_P} $@ + # Note that all the Info targets build the Info files in srcdir. # There is no provision for Info files to exist in the build directory. # In a distribution of Emacs, the Info files should be up to date. -# Note: "<" is not portable in ordinary make rules. -$(buildinfodir)/emacs.info: ${EMACSSOURCES} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs.texi +$(buildinfodir)/emacs.info: ${EMACSSOURCES} | ${buildinfodir} + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< emacs.dvi: ${EMACSSOURCES} - $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi + $(ENVADD) $(TEXI2DVI) $< emacs.pdf: ${EMACSSOURCES} - $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs.texi + $(ENVADD) $(TEXI2PDF) $< emacs.html: ${EMACSSOURCES} - $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/emacs.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< emacs-xtra.dvi: $(EMACS_XTRA) - $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-xtra.texi + $(ENVADD) $(TEXI2DVI) $< emacs-xtra.pdf: $(EMACS_XTRA) - $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-xtra.texi + $(ENVADD) $(TEXI2PDF) $< + +%.ps: %.dvi + $(DVIPS) -o $@ $< .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2014-06-23 06:25:47 +0000 +++ doc/lispintro/ChangeLog 2014-06-23 06:43:20 +0000 @@ -1,6 +1,14 @@ 2014-06-23 Glenn Morris * Makefile.in (%.texi): Disable implicit rules. + (mkinfodir): Remove. + (.dvi.ps): Replace with explicit rule. + (${buildinfodir}): New rule. + (${buildinfodir}/eintr.info): Use order-only prereq for output dir. + Use $<. + (emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html): + Use $<. + (emacs-lisp-intro.ps): New rule. 2014-06-15 Glenn Morris === modified file 'doc/lispintro/Makefile.in' --- doc/lispintro/Makefile.in 2014-06-23 06:25:47 +0000 +++ doc/lispintro/Makefile.in 2014-06-23 06:43:20 +0000 @@ -66,8 +66,6 @@ PDF_TARGETS = emacs-lisp-intro.pdf PS_TARGETS = emacs-lisp-intro.ps -mkinfodir = @${MKDIR_P} ${buildinfodir} - srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi \ ${emacsdir}/emacsver.texi @@ -76,33 +74,31 @@ .PHONY: info dvi html pdf ps -.SUFFIXES: .ps .dvi - -.dvi.ps: - $(DVIPS) -o $@ $< - info: ${buildinfodir}/eintr.info - dvi: $(DVI_TARGETS) html: $(HTML_TARGETS) pdf: $(PDF_TARGETS) ps: $(PS_TARGETS) +${buildinfodir}: + ${MKDIR_P} $@ + # The file name eintr must fit within 5 characters, to allow for # -NN extensions to fit into DOS 8+3 limits without clashing. -# Note: "<" is not portable in ordinary make rules. -${buildinfodir}/eintr.info: ${srcs} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi +${buildinfodir}/eintr.info: ${srcs} | ${buildinfodir} + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< emacs-lisp-intro.dvi: ${srcs} - $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-lisp-intro.texi + $(ENVADD) $(TEXI2DVI) $< emacs-lisp-intro.pdf: ${srcs} - $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-lisp-intro.texi + $(ENVADD) $(TEXI2PDF) $< emacs-lisp-intro.html: ${srcs} - $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< + +emacs-lisp-intro.ps: emacs-lisp-intro.dvi + $(DVIPS) -o $@ $< .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-06-23 06:25:47 +0000 +++ doc/lispref/ChangeLog 2014-06-23 06:43:20 +0000 @@ -1,6 +1,14 @@ 2014-06-23 Glenn Morris * Makefile.in (%.texi): Disable implicit rules. + (mkinfodir): Remove. + (.dvi.ps): Replace with explicit rule. + (html): Declare as PHONY. + (${buildinfodir}): New rule. + ($(buildinfodir)/elisp.info): Use order-only prereq for output dir. + Use $<. + (elisp.dvi, elisp.html, elisp.pdf): Use $<. + (elisp.ps): New rule. 2014-06-21 Eli Zaretskii === modified file 'doc/lispref/Makefile.in' --- doc/lispref/Makefile.in 2014-06-23 06:25:47 +0000 +++ doc/lispref/Makefile.in 2014-06-23 06:43:20 +0000 @@ -124,17 +124,10 @@ $(srcdir)/gpl.texi \ $(srcdir)/doclicense.texi -mkinfodir = @${MKDIR_P} ${buildinfodir} - ## Disable implicit rules. %.texi: ; -.PHONY: info dvi pdf ps - -.SUFFIXES: .ps .dvi - -.dvi.ps: - $(DVIPS) -o $@ $< +.PHONY: info dvi html pdf ps info: $(buildinfodir)/elisp.info dvi: $(DVI_TARGETS) @@ -142,19 +135,23 @@ pdf: $(PDF_TARGETS) ps: $(PS_TARGETS) -## Note: "<" is not portable in ordinary make rules. -$(buildinfodir)/elisp.info: $(srcs) - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $(srcdir)/elisp.texi +${buildinfodir}: + ${MKDIR_P} $@ + +$(buildinfodir)/elisp.info: $(srcs) | ${buildinfodir} + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< elisp.dvi: $(srcs) - $(ENVADD) $(TEXI2DVI) $(srcdir)/elisp.texi + $(ENVADD) $(TEXI2DVI) $< elisp.html: $(srcs) - $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $(srcdir)/elisp.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< elisp.pdf: $(srcs) - $(ENVADD) $(TEXI2PDF) $(srcdir)/elisp.texi + $(ENVADD) $(TEXI2PDF) $< + +elisp.ps: elisp.dvi + $(DVIPS) -o $@ $< .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean ------------------------------------------------------------ revno: 117380 committer: Glenn Morris branch nick: trunk timestamp: Sun 2014-06-22 23:25:47 -0700 message: Disable implicit texi rules in doc/ * doc/emacs/Makefile.in (%.texi): * doc/lispintro/Makefile.in (%.texi): * doc/lispref/Makefile.in (%.texi): * doc/misc/Makefile.in (%.texi): Disable implicit rules. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-06-15 00:17:21 +0000 +++ doc/emacs/ChangeLog 2014-06-23 06:25:47 +0000 @@ -1,3 +1,7 @@ +2014-06-23 Glenn Morris + + * Makefile.in (%.texi): Disable implicit rules. + 2014-06-15 Glenn Morris * Makefile.in (bootstrap-clean): New. === modified file 'doc/emacs/Makefile.in' --- doc/emacs/Makefile.in 2014-06-15 00:17:21 +0000 +++ doc/emacs/Makefile.in 2014-06-23 06:25:47 +0000 @@ -145,6 +145,9 @@ ## The info/ directory exists in release tarfiles but not the repository. mkinfodir = @${MKDIR_P} ${buildinfodir} +## Disable implicit rules. +%.texi: ; + .PHONY: info dvi html pdf ps .SUFFIXES: .ps .dvi === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2014-06-15 00:17:21 +0000 +++ doc/lispintro/ChangeLog 2014-06-23 06:25:47 +0000 @@ -1,3 +1,7 @@ +2014-06-23 Glenn Morris + + * Makefile.in (%.texi): Disable implicit rules. + 2014-06-15 Glenn Morris * Makefile.in (bootstrap-clean): New. === modified file 'doc/lispintro/Makefile.in' --- doc/lispintro/Makefile.in 2014-06-15 00:17:21 +0000 +++ doc/lispintro/Makefile.in 2014-06-23 06:25:47 +0000 @@ -71,6 +71,9 @@ srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi \ ${emacsdir}/emacsver.texi +## Disable implicit rules. +%.texi: ; + .PHONY: info dvi html pdf ps .SUFFIXES: .ps .dvi === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-06-21 19:45:59 +0000 +++ doc/lispref/ChangeLog 2014-06-23 06:25:47 +0000 @@ -1,3 +1,7 @@ +2014-06-23 Glenn Morris + + * Makefile.in (%.texi): Disable implicit rules. + 2014-06-21 Eli Zaretskii * positions.texi (Screen Lines): Clarify how columns are counted === modified file 'doc/lispref/Makefile.in' --- doc/lispref/Makefile.in 2014-06-15 00:17:21 +0000 +++ doc/lispref/Makefile.in 2014-06-23 06:25:47 +0000 @@ -126,6 +126,9 @@ mkinfodir = @${MKDIR_P} ${buildinfodir} +## Disable implicit rules. +%.texi: ; + .PHONY: info dvi pdf ps .SUFFIXES: .ps .dvi === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-06-22 23:12:17 +0000 +++ doc/misc/ChangeLog 2014-06-23 06:25:47 +0000 @@ -1,3 +1,7 @@ +2014-06-23 Glenn Morris + + * Makefile.in (%.texi): Disable implicit rules. + 2014-06-22 Mario Lang * srecode.texi (Base Arguments): The the -> to the. === modified file 'doc/misc/Makefile.in' --- doc/misc/Makefile.in 2014-06-15 00:17:21 +0000 +++ doc/misc/Makefile.in 2014-06-23 06:25:47 +0000 @@ -107,6 +107,9 @@ ## Prevent implicit rule triggering for foo.info. .SUFFIXES: +## Disable implicit rules. +%.texi: ; + # Default. info: $(INFO_TARGETS) ------------------------------------------------------------ revno: 117379 committer: Eli Barzilay branch nick: trunk timestamp: Mon 2014-06-23 01:14:23 -0400 message: * calculator.el (calculator-standard-displayer): Fix bug in use of `calculator-groupize-number'. (calculator-funcall): Fix broken `cl-flet' use by moving it into the `eval' code, so it works in v24.3.1 too. (calculator-last-input): Comment to clarify purpose. Also add back a ChangeLog blurb for previous commit 117340. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-06-22 23:12:17 +0000 +++ lisp/ChangeLog 2014-06-23 05:14:23 +0000 @@ -1,3 +1,11 @@ +2014-06-23 Eli Barzilay + + * calculator.el (calculator-standard-displayer): Fix bug in use of + `calculator-groupize-number'. + (calculator-funcall): Fix broken `cl-flet' use by moving it into the + `eval' code, so it works in v24.3.1 too. + (calculator-last-input): Comment to clarify purpose. + 2014-06-22 Mario Lang * textmodes/rst.el (rst-comment-region): From from -> from. @@ -194,6 +202,48 @@ rlogin is anymore. (dun-help): Bump version number; update contact info. +2014-06-15 Eli Barzilay + + * calculator.el (calculator-prompt, calculator-remove-zeros) + (calculator-mode-hook, calculator-operators, calculator-stack) + (calculator-mode): Tweak docstring. + (calculator-user-operators): Tweak docstring, fix a bug in the last + example. + (calculator-displayer): `std' case has an optional boolean. + (calculator-displayers): Use the new boolean to group in decimal mode. + (calculator-mode-map, calculator, calculator-message) + (calculator-op-arity, calculator-add-operators) + (calculator-string-to-number, calculator-displayer-prev) + (calculator-displayer-next, calculator-remove-zeros) + (calculator-eng-display, calculator-number-to-string) + (calculator-update-display, calculator-last-input) + (calculator-clear-fragile, calculator-digit, calculator-decimal) + (calculator-exp, calculator-saved-move, calculator-clear) + (calculator-copy, calculator-put-value, calculator-help) + (calculator-expt, calculator-truncate): Minor code improvements. + (calculator-need-3-lines): New function pulling out code from + `calculator'. + (calculator-get-display): Renamed from `calculator-get-prompt', and + improved. + (calculator-push-curnum): Renamed from `calculator-curnum-value', and + extended for all uses of it. All callers changed. + (calculator-groupize-number): New utility for splitting a number into + groups. + (calculator-standard-displayer): Improve code, new optional argument to + use comma-split groups, make second argument optional too to use with + 'left/'right inputs. All callers changed. + (calculator-reduce-stack-once): New utility, doing the meat of what + `calculator-reduce-stack' used to do, much improved (mostly using + `pcase' for conciseness and clarity). + (calculator-reduce-stack): Now doing just the reduction loop using + `calculator-reduce-stack-once'. + (calculator-funcall): Improved code, make it work in v24.3.1 too. + (calculator-last-input): Improved code, remove some old cruft. + (calculator-quit): Kill `calculator-buffer' in electric mode too. + (calculator-integer-p): Removed. + (calculator-fact): Improved code, make it work on non-integer values + too (using truncated numbers). + 2014-06-15 Michael Albinus Sync with Tramp 2.2.10. === modified file 'lisp/calculator.el' --- lisp/calculator.el 2014-06-15 04:52:34 +0000 +++ lisp/calculator.el 2014-06-23 05:14:23 +0000 @@ -1019,8 +1019,9 @@ (s (calculator-remove-zeros (format s num))) (s (if (or (not group-p) (string-match-p "[eE]" s)) s (replace-regexp-in-string - "\\([0-9]+\\)\\(?:\\.\\|$\\)" - (lambda (s) (calculator-groupize-number s 3 ",")) + "\\([0-9]+\\)\\(?:\\..*\\|$\\)" + (lambda (_) (calculator-groupize-number + (match-string 1 s) 3 ",")) s nil nil 1)))) s))) @@ -1197,12 +1198,13 @@ (let ((TX (and X (calculator-truncate X))) (TY (and Y (calculator-truncate Y))) (DX (if (and X calculator-deg) (/ (* X pi) 180) X)) - (L calculator-saved-list)) - (cl-flet ((F (&optional x y) (calculator-funcall f x y)) - (D (x) (if calculator-deg (/ (* x 180) float-pi) x))) - (eval `(let ((X ,X) (Y ,Y) (DX ,DX) (TX ,TX) (TY ,TY) (L ',L)) - ,f) - t))))) + (L calculator-saved-list) + (fF `(calculator-funcall ',f x y)) + (fD `(if calculator-deg (/ (* x 180) float-pi) x))) + (eval `(cl-flet ((F (&optional x y) ,fF) (D (x) ,fD)) + (let ((X ,X) (Y ,Y) (DX ,DX) (TX ,TX) (TY ,TY) (L ',L)) + ,f)) + t)))) ;;;--------------------------------------------------------------------- ;;; Input interaction @@ -1213,9 +1215,12 @@ (let ((inp (or keys (this-command-keys)))) (if (or (stringp inp) (not (arrayp inp))) inp - ;; translates kp-x to x and [tries to] create a string to lookup + ;; Translates kp-x to x and [tries to] create a string to lookup ;; operators; assume all symbols are translatable via - ;; `function-key-map' or with an 'ascii-character property + ;; `function-key-map' or with an 'ascii-character property. This + ;; is needed because we have key bindings for kp-* (which might be + ;; the wrong thing to do) so they don't get translated in + ;; `this-command-keys'. (concat (mapcar (lambda (k) (if (numberp k) k (or (get k 'ascii-character) (error "??bad key??")))) ------------------------------------------------------------ revno: 117378 committer: Dmitry Antipov branch nick: trunk timestamp: Mon 2014-06-23 08:11:29 +0400 message: Simplify and cleanup character conversion stuff. * lisp.h (multibyte_char_to_unibyte, multibyte_char_to_unibyte_safe): Remove prototypes. * character.c (multibyte_char_to_unibyte) (multibyte_char_to_unibyte_safe): Remove; no longer used. * character.h (make_char): Remove; unused. (CHAR_TO_BYTE8, CHAR_TO_BYTE_SAFE): Simplify. (ASCII_BYTE_P): Remove; ASCII_CHAR_P does the same thing. * buffer.c, charset.c, charset.h, cmds.c, coding.c, editfns.c: * fileio.c, indent.c, insdel.c, keyboard.c, lread.c, print.c: * search.c, term.c, xdisp.c, xterm.c: Related users changed. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-06-22 23:12:17 +0000 +++ src/ChangeLog 2014-06-23 04:11:29 +0000 @@ -1,3 +1,17 @@ +2014-06-23 Dmitry Antipov + + Simplify and cleanup character conversion stuff. + * lisp.h (multibyte_char_to_unibyte, multibyte_char_to_unibyte_safe): + Remove prototypes. + * character.c (multibyte_char_to_unibyte) + (multibyte_char_to_unibyte_safe): Remove; no longer used. + * character.h (make_char): Remove; unused. + (CHAR_TO_BYTE8, CHAR_TO_BYTE_SAFE): Simplify. + (ASCII_BYTE_P): Remove; ASCII_CHAR_P does the same thing. + * buffer.c, charset.c, charset.h, cmds.c, coding.c, editfns.c: + * fileio.c, indent.c, insdel.c, keyboard.c, lread.c, print.c: + * search.c, term.c, xdisp.c, xterm.c: Related users changed. + 2014-06-22 Mario Lang * w32fns.c (Fw32_shell_execute): The the -> the. === modified file 'src/buffer.c' --- src/buffer.c 2014-05-29 14:52:47 +0000 +++ src/buffer.c 2014-06-23 04:11:29 +0000 @@ -2530,7 +2530,7 @@ p = GAP_END_ADDR; stop = Z; } - if (ASCII_BYTE_P (*p)) + if (ASCII_CHAR_P (*p)) p++, pos++; else if (CHAR_BYTE8_HEAD_P (*p)) { @@ -2602,7 +2602,7 @@ stop = Z; } - if (ASCII_BYTE_P (*p)) + if (ASCII_CHAR_P (*p)) p++, pos++; else if (EQ (flag, Qt) && ! CHAR_BYTE8_HEAD_P (*p) === modified file 'src/character.c' --- src/character.c 2014-01-01 07:43:34 +0000 +++ src/character.c 2014-06-23 04:11:29 +0000 @@ -233,32 +233,6 @@ return c; } -/* Convert ASCII or 8-bit character C to unibyte. If C is none of - them, return (C & 0xFF). */ - -int -multibyte_char_to_unibyte (int c) -{ - if (c < 0x80) - return c; - if (CHAR_BYTE8_P (c)) - return CHAR_TO_BYTE8 (c); - return (c & 0xFF); -} - -/* Like multibyte_char_to_unibyte, but return -1 if C is not supported - by charset_unibyte. */ - -int -multibyte_char_to_unibyte_safe (int c) -{ - if (c < 0x80) - return c; - if (CHAR_BYTE8_P (c)) - return CHAR_TO_BYTE8 (c); - return -1; -} - DEFUN ("characterp", Fcharacterp, Scharacterp, 1, 2, 0, doc: /* Return non-nil if OBJECT is a character. In Emacs Lisp, characters are represented by character codes, which === modified file 'src/character.h' --- src/character.h 2014-02-14 16:11:11 +0000 +++ src/character.h 2014-06-23 04:11:29 +0000 @@ -67,20 +67,15 @@ #define BYTE8_TO_CHAR(byte) ((byte) + 0x3FFF00) #define UNIBYTE_TO_CHAR(byte) \ - (ASCII_BYTE_P (byte) ? (byte) : BYTE8_TO_CHAR (byte)) + (ASCII_CHAR_P (byte) ? (byte) : BYTE8_TO_CHAR (byte)) /* Return the raw 8-bit byte for character C. */ -#define CHAR_TO_BYTE8(c) \ - (CHAR_BYTE8_P (c) \ - ? (c) - 0x3FFF00 \ - : multibyte_char_to_unibyte (c)) +#define CHAR_TO_BYTE8(c) (CHAR_BYTE8_P (c) ? (c) - 0x3FFF00 : (c & 0xFF)) /* Return the raw 8-bit byte for character C, or -1 if C doesn't correspond to a byte. */ -#define CHAR_TO_BYTE_SAFE(c) \ - (CHAR_BYTE8_P (c) \ - ? (c) - 0x3FFF00 \ - : multibyte_char_to_unibyte_safe (c)) +#define CHAR_TO_BYTE_SAFE(c) \ + (ASCII_CHAR_P (c) ? c : (CHAR_BYTE8_P (c) ? (c) - 0x3FFF00 : -1)) /* Nonzero iff BYTE is the 1st byte of a multibyte form of a character that corresponds to a raw 8-bit byte. */ @@ -101,13 +96,6 @@ /* This is the maximum byte length of multibyte form. */ #define MAX_MULTIBYTE_LENGTH 5 -/* Return a Lisp character whose character code is C. Assumes C is - a valid character code. */ -#define make_char(c) make_number (c) - -/* Nonzero iff C is an ASCII byte. */ -#define ASCII_BYTE_P(c) UNSIGNED_CMP (c, <, 0x80) - /* Nonzero iff X is a character. */ #define CHARACTERP(x) (NATNUMP (x) && XFASTINT (x) <= MAX_CHAR) @@ -222,7 +210,7 @@ /* Nonzero iff BYTE starts a character in a multibyte form. This is equivalent to: - (ASCII_BYTE_P (byte) || LEADING_CODE_P (byte)) */ + (ASCII_CHAR_P (byte) || LEADING_CODE_P (byte)) */ #define CHAR_HEAD_P(byte) (((byte) & 0xC0) != 0x80) /* How many bytes a character that starts with BYTE occupies in a === modified file 'src/charset.c' --- src/charset.c 2014-04-05 19:30:36 +0000 +++ src/charset.c 2014-06-23 04:11:29 +0000 @@ -389,12 +389,12 @@ { if (ascii_compatible_p) { - if (! ASCII_BYTE_P (from_c)) + if (! ASCII_CHAR_P (from_c)) { if (from_c < nonascii_min_char) nonascii_min_char = from_c; } - else if (! ASCII_BYTE_P (to_c)) + else if (! ASCII_CHAR_P (to_c)) { nonascii_min_char = 0x80; } @@ -1522,7 +1522,7 @@ if (!NILP (table)) c = translate_char (table, c); - if (ASCII_BYTE_P (c)) + if (ASCII_CHAR_P (c)) ASET (charsets, charset_ascii, Qt); else ASET (charsets, charset_eight_bit, Qt); === modified file 'src/charset.h' --- src/charset.h 2014-01-01 07:43:34 +0000 +++ src/charset.h 2014-06-23 04:11:29 +0000 @@ -403,7 +403,7 @@ Try some optimization before calling decode_char. */ #define DECODE_CHAR(charset, code) \ - ((ASCII_BYTE_P (code) && (charset)->ascii_compatible_p) \ + ((ASCII_CHAR_P (code) && (charset)->ascii_compatible_p) \ ? (code) \ : ((code) < (charset)->min_code || (code) > (charset)->max_code) \ ? -1 \ === modified file 'src/cmds.c' --- src/cmds.c 2014-06-02 00:18:22 +0000 +++ src/cmds.c 2014-06-23 04:11:29 +0000 @@ -359,9 +359,7 @@ } else { - str[0] = (SINGLE_BYTE_CHAR_P (c) - ? c - : multibyte_char_to_unibyte (c)); + str[0] = SINGLE_BYTE_CHAR_P (c) ? c : CHAR_TO_BYTE8 (c); len = 1; } if (!NILP (overwrite) === modified file 'src/coding.c' --- src/coding.c 2014-04-05 19:30:36 +0000 +++ src/coding.c 2014-06-23 04:11:29 +0000 @@ -1485,7 +1485,7 @@ src = src_base; consumed_chars = consumed_chars_base; ONE_MORE_BYTE (c); - *charbuf++ = ASCII_BYTE_P (c) ? c : BYTE8_TO_CHAR (c); + *charbuf++ = ASCII_CHAR_P (c) ? c : BYTE8_TO_CHAR (c); coding->errors++; } @@ -1725,7 +1725,7 @@ ONE_MORE_BYTE (c2); if (c2 < 0) { - *charbuf++ = ASCII_BYTE_P (c1) ? c1 : BYTE8_TO_CHAR (c1); + *charbuf++ = ASCII_CHAR_P (c1) ? c1 : BYTE8_TO_CHAR (c1); *charbuf++ = -c2; continue; } @@ -2108,7 +2108,7 @@ case 1: code = c; - charset_ID = ASCII_BYTE_P (code) ? charset_ascii : charset_eight_bit; + charset_ID = ASCII_CHAR_P (code) ? charset_ascii : charset_eight_bit; break; default: @@ -2596,7 +2596,7 @@ src = src_base; consumed_chars = consumed_chars_base; ONE_MORE_BYTE (c); - *charbuf++ = ASCII_BYTE_P (c) ? c : BYTE8_TO_CHAR (c); + *charbuf++ = ASCII_CHAR_P (c) ? c : BYTE8_TO_CHAR (c); char_offset++; coding->errors++; } @@ -3573,7 +3573,7 @@ if (CODING_ISO_EXTSEGMENT_LEN (coding) > 0) { - *charbuf++ = ASCII_BYTE_P (c1) ? c1 : BYTE8_TO_CHAR (c1); + *charbuf++ = ASCII_CHAR_P (c1) ? c1 : BYTE8_TO_CHAR (c1); char_offset++; CODING_ISO_EXTSEGMENT_LEN (coding)--; continue; @@ -3600,7 +3600,7 @@ } else { - *charbuf++ = ASCII_BYTE_P (c1) ? c1 : BYTE8_TO_CHAR (c1); + *charbuf++ = ASCII_CHAR_P (c1) ? c1 : BYTE8_TO_CHAR (c1); char_offset++; } continue; @@ -3974,7 +3974,7 @@ MAYBE_FINISH_COMPOSITION (); for (; src_base < src; src_base++, char_offset++) { - if (ASCII_BYTE_P (*src_base)) + if (ASCII_CHAR_P (*src_base)) *charbuf++ = *src_base; else *charbuf++ = BYTE8_TO_CHAR (*src_base); @@ -4004,7 +4004,7 @@ src = src_base; consumed_chars = consumed_chars_base; ONE_MORE_BYTE (c); - *charbuf++ = c < 0 ? -c : ASCII_BYTE_P (c) ? c : BYTE8_TO_CHAR (c); + *charbuf++ = c < 0 ? -c : ASCII_CHAR_P (c) ? c : BYTE8_TO_CHAR (c); char_offset++; coding->errors++; /* Reset the invocation and designation status to the safest @@ -5640,7 +5640,7 @@ src = src_base; consumed_chars = consumed_chars_base; ONE_MORE_BYTE (c); - *charbuf++ = c < 0 ? -c : ASCII_BYTE_P (c) ? c : BYTE8_TO_CHAR (c); + *charbuf++ = c < 0 ? -c : ASCII_CHAR_P (c) ? c : BYTE8_TO_CHAR (c); char_offset++; coding->errors++; } @@ -9031,13 +9031,13 @@ p = pbeg = BYTE_POS_ADDR (start_byte); pend = p + (end_byte - start_byte); - while (p < pend && ASCII_BYTE_P (*p)) p++; - while (p < pend && ASCII_BYTE_P (*(pend - 1))) pend--; + while (p < pend && ASCII_CHAR_P (*p)) p++; + while (p < pend && ASCII_CHAR_P (*(pend - 1))) pend--; work_table = Fmake_char_table (Qnil, Qnil); while (p < pend) { - if (ASCII_BYTE_P (*p)) + if (ASCII_CHAR_P (*p)) p++; else { @@ -9169,7 +9169,7 @@ int c; if (ascii_compatible) - while (p < stop && ASCII_BYTE_P (*p)) + while (p < stop && ASCII_CHAR_P (*p)) p++, from++; if (p >= stop) { @@ -9285,12 +9285,12 @@ p = pbeg = BYTE_POS_ADDR (start_byte); pend = p + (end_byte - start_byte); - while (p < pend && ASCII_BYTE_P (*p)) p++, pos++; - while (p < pend && ASCII_BYTE_P (*(pend - 1))) pend--; + while (p < pend && ASCII_CHAR_P (*p)) p++, pos++; + while (p < pend && ASCII_CHAR_P (*(pend - 1))) pend--; while (p < pend) { - if (ASCII_BYTE_P (*p)) + if (ASCII_CHAR_P (*p)) p++; else { @@ -9598,7 +9598,7 @@ CHECK_CODING_SYSTEM_GET_SPEC (Vsjis_coding_system, spec); attrs = AREF (spec, 0); - if (ASCII_BYTE_P (ch) + if (ASCII_CHAR_P (ch) && ! NILP (CODING_ATTR_ASCII_COMPAT (attrs))) return code; @@ -9679,7 +9679,7 @@ CHECK_CODING_SYSTEM_GET_SPEC (Vbig5_coding_system, spec); attrs = AREF (spec, 0); - if (ASCII_BYTE_P (ch) + if (ASCII_CHAR_P (ch) && ! NILP (CODING_ATTR_ASCII_COMPAT (attrs))) return code; === modified file 'src/editfns.c' --- src/editfns.c 2014-06-17 13:50:22 +0000 +++ src/editfns.c 2014-06-23 04:11:29 +0000 @@ -2238,7 +2238,7 @@ len = CHAR_STRING (c, str); else { - str[0] = ASCII_CHAR_P (c) ? c : multibyte_char_to_unibyte (c); + str[0] = CHAR_TO_BYTE8 (c); len = 1; } (*insert_func) ((char *) str, len); @@ -2852,7 +2852,7 @@ len = CHAR_STRING (fromc, fromstr); if (CHAR_STRING (toc, tostr) != len) error ("Characters in `subst-char-in-region' have different byte-lengths"); - if (!ASCII_BYTE_P (*tostr)) + if (!ASCII_CHAR_P (*tostr)) { /* If *TOSTR is in the range 0x80..0x9F and TOCHAR is not a complete multibyte character, it may be combined with the @@ -2945,7 +2945,7 @@ : ((pos_byte_next < Z_BYTE && ! CHAR_HEAD_P (FETCH_BYTE (pos_byte_next))) || (pos_byte > BEG_BYTE - && ! ASCII_BYTE_P (FETCH_BYTE (pos_byte - 1)))))) + && ! ASCII_CHAR_P (FETCH_BYTE (pos_byte - 1)))))) { Lisp_Object tem, string; @@ -3126,7 +3126,7 @@ else { nc = tt[oc]; - if (! ASCII_BYTE_P (nc) && multibyte) + if (! ASCII_CHAR_P (nc) && multibyte) { str_len = BYTE8_STRING (nc, buf); str = buf; @@ -3877,7 +3877,7 @@ if (p > buf && multibyte - && !ASCII_BYTE_P (*((unsigned char *) p - 1)) + && !ASCII_CHAR_P (*((unsigned char *) p - 1)) && STRING_MULTIBYTE (args[n]) && !CHAR_HEAD_P (SREF (args[n], 0))) maybe_combine_byte = 1; @@ -4167,7 +4167,7 @@ { /* Copy a whole multibyte character. */ if (p > buf - && !ASCII_BYTE_P (*((unsigned char *) p - 1)) + && !ASCII_CHAR_P (*((unsigned char *) p - 1)) && !CHAR_HEAD_P (*format)) maybe_combine_byte = 1; @@ -4181,7 +4181,7 @@ else { unsigned char uc = *format++; - if (! multibyte || ASCII_BYTE_P (uc)) + if (! multibyte || ASCII_CHAR_P (uc)) convbytes = 1; else { === modified file 'src/fileio.c' --- src/fileio.c 2014-06-21 19:45:59 +0000 +++ src/fileio.c 2014-06-23 04:11:29 +0000 @@ -990,7 +990,7 @@ { unsigned char *p = SDATA (name); - while (*p && ASCII_BYTE_P (*p)) + while (*p && ASCII_CHAR_P (*p)) p++; if (*p == '\0') { === modified file 'src/indent.c' --- src/indent.c 2014-06-21 12:30:02 +0000 +++ src/indent.c 2014-06-23 04:11:29 +0000 @@ -920,7 +920,7 @@ column += tab_width - column % tab_width; break; default: - if (ASCII_BYTE_P (p[-1]) + if (ASCII_CHAR_P (p[-1]) || NILP (BVAR (current_buffer, enable_multibyte_characters))) return column; { === modified file 'src/insdel.c' --- src/insdel.c 2014-04-18 23:36:51 +0000 +++ src/insdel.c 2014-06-23 04:11:29 +0000 @@ -701,7 +701,7 @@ (2) POS is the last of the current buffer. (3) A character at POS can't be a following byte of multibyte character. */ - if (length > 0 && ASCII_BYTE_P (string[length - 1])) /* case (1) */ + if (length > 0 && ASCII_CHAR_P (string[length - 1])) /* case (1) */ return 0; if (pos_byte == Z_BYTE) /* case (2) */ return 0; === modified file 'src/keyboard.c' --- src/keyboard.c 2014-06-21 19:45:59 +0000 +++ src/keyboard.c 2014-06-23 04:11:29 +0000 @@ -2084,7 +2084,7 @@ /* Save the upper bits here. */ int upper = c & ~0177; - if (! ASCII_BYTE_P (c)) + if (! ASCII_CHAR_P (c)) return c |= ctrl_modifier; c &= 0177; === modified file 'src/lisp.h' --- src/lisp.h 2014-06-17 16:09:19 +0000 +++ src/lisp.h 2014-06-23 04:11:29 +0000 @@ -3433,8 +3433,6 @@ /* Defined in character.c. */ extern ptrdiff_t chars_in_text (const unsigned char *, ptrdiff_t); extern ptrdiff_t multibyte_chars_in_text (const unsigned char *, ptrdiff_t); -extern int multibyte_char_to_unibyte (int) ATTRIBUTE_CONST; -extern int multibyte_char_to_unibyte_safe (int) ATTRIBUTE_CONST; extern void syms_of_character (void); /* Defined in charset.c. */ === modified file 'src/lread.c' --- src/lread.c 2014-06-17 13:50:22 +0000 +++ src/lread.c 2014-06-23 04:11:29 +0000 @@ -213,7 +213,7 @@ else { c = BUF_FETCH_BYTE (inbuffer, pt_byte); - if (! ASCII_BYTE_P (c)) + if (! ASCII_CHAR_P (c)) c = BYTE8_TO_CHAR (c); pt_byte++; } @@ -242,7 +242,7 @@ else { c = BUF_FETCH_BYTE (inbuffer, bytepos); - if (! ASCII_BYTE_P (c)) + if (! ASCII_CHAR_P (c)) c = BYTE8_TO_CHAR (c); bytepos++; } @@ -324,7 +324,7 @@ return c; if (multibyte) *multibyte = 1; - if (ASCII_BYTE_P (c)) + if (ASCII_CHAR_P (c)) return c; if (emacs_mule_encoding) return read_emacs_mule_char (c, readbyte, readcharfun); === modified file 'src/print.c' --- src/print.c 2014-02-03 07:05:28 +0000 +++ src/print.c 2014-06-23 04:11:29 +0000 @@ -1472,7 +1472,7 @@ strout (outbuf, len, len, printcharfun); } else if (! multibyte - && SINGLE_BYTE_CHAR_P (c) && ! ASCII_BYTE_P (c) + && SINGLE_BYTE_CHAR_P (c) && ! ASCII_CHAR_P (c) && print_escape_nonascii) { /* When printing in a multibyte buffer === modified file 'src/search.c' --- src/search.c 2014-04-25 16:11:07 +0000 +++ src/search.c 2014-06-23 04:11:29 +0000 @@ -1416,7 +1416,7 @@ while (boyer_moore_ok) { - if (ASCII_BYTE_P (inverse)) + if (ASCII_CHAR_P (inverse)) { if (this_char_base > 0) boyer_moore_ok = 0; @@ -1827,7 +1827,7 @@ matching with CHAR_BASE are to be checked. */ int ch = -1; - if (ASCII_BYTE_P (*ptr) || ! multibyte) + if (ASCII_CHAR_P (*ptr) || ! multibyte) ch = *ptr; else if (char_base && ((pat_end - ptr) == 1 || CHAR_HEAD_P (ptr[1]))) @@ -2596,7 +2596,7 @@ { FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, newtext, pos, pos_byte); if (!buf_multibyte) - c = multibyte_char_to_unibyte (c); + c = CHAR_TO_BYTE8 (c); } else { @@ -2619,7 +2619,7 @@ FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, newtext, pos, pos_byte); if (!buf_multibyte && !ASCII_CHAR_P (c)) - c = multibyte_char_to_unibyte (c); + c = CHAR_TO_BYTE8 (c); } else { === modified file 'src/term.c' --- src/term.c 2014-06-08 18:27:22 +0000 +++ src/term.c 2014-06-23 04:11:29 +0000 @@ -1861,7 +1861,7 @@ acronym = XCDR (acronym); buf[0] = '['; str = STRINGP (acronym) ? SSDATA (acronym) : ""; - for (len = 0; len < 6 && str[len] && ASCII_BYTE_P (str[len]); len++) + for (len = 0; len < 6 && str[len] && ASCII_CHAR_P (str[len]); len++) buf[1 + len] = str[len]; buf[1 + len] = ']'; len += 2; === modified file 'src/xdisp.c' --- src/xdisp.c 2014-06-21 19:45:59 +0000 +++ src/xdisp.c 2014-06-23 04:11:29 +0000 @@ -8269,7 +8269,7 @@ /* Get the next character, maybe multibyte. */ p = BYTE_POS_ADDR (IT_BYTEPOS (*it)); - if (it->multibyte_p && !ASCII_BYTE_P (*p)) + if (it->multibyte_p && !ASCII_CHAR_P (*p)) it->c = STRING_CHAR_AND_LENGTH (p, it->len); else it->c = *p, it->len = 1; @@ -9932,9 +9932,7 @@ for (i = 0; i < nbytes; i += char_bytes) { c = string_char_and_length (msg + i, &char_bytes); - work[0] = (ASCII_CHAR_P (c) - ? c - : multibyte_char_to_unibyte (c)); + work[0] = CHAR_TO_BYTE8 (c); insert_1_both (work, 1, 1, 1, 0, 0); } } @@ -25781,7 +25779,7 @@ sprintf (buf, "%0*X", it->c < 0x10000 ? 4 : 6, it->c); str = buf; } - for (len = 0; str[len] && ASCII_BYTE_P (str[len]) && len < 6; len++) + for (len = 0; str[len] && ASCII_CHAR_P (str[len]) && len < 6; len++) code[len] = font->driver->encode_char (font, str[len]); upper_len = (len + 1) / 2; font->driver->text_extents (font, code, upper_len, === modified file 'src/xterm.c' --- src/xterm.c 2014-06-22 05:00:14 +0000 +++ src/xterm.c 2014-06-23 04:11:29 +0000 @@ -6460,7 +6460,7 @@ for (i = 0, nchars = 0; i < nbytes; i++) { - if (ASCII_BYTE_P (copy_bufptr[i])) + if (ASCII_CHAR_P (copy_bufptr[i])) nchars++; STORE_KEYSYM_FOR_DEBUG (copy_bufptr[i]); } ------------------------------------------------------------ revno: 117377 committer: Mario Lang branch nick: trunk timestamp: Mon 2014-06-23 01:12:17 +0200 message: "the the", "from from" and "and and". diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-06-21 19:45:59 +0000 +++ doc/misc/ChangeLog 2014-06-22 23:12:17 +0000 @@ -1,3 +1,9 @@ +2014-06-22 Mario Lang + + * srecode.texi (Base Arguments): The the -> to the. + + * org.texi (Images in ODT export): The the -> the. + 2014-06-21 Eli Zaretskii * autotype.texi (Skeleton Language): Document the feature of \n === modified file 'doc/misc/org.texi' --- doc/misc/org.texi 2014-06-10 02:20:31 +0000 +++ doc/misc/org.texi 2014-06-22 23:12:17 +0000 @@ -12228,7 +12228,7 @@ @cindex #+ATTR_ODT You can control the manner in which an image is anchored by setting the @code{:anchor} property of it's @code{#+ATTR_ODT} line. You can specify one -of the the following three values for the @code{:anchor} property: +of the following three values for the @code{:anchor} property: @samp{"as-char"}, @samp{"paragraph"} and @samp{"page"}. To create an image that is anchored to a page, do the following: === modified file 'doc/misc/srecode.texi' --- doc/misc/srecode.texi 2014-06-10 02:20:31 +0000 +++ doc/misc/srecode.texi 2014-06-22 23:12:17 +0000 @@ -1191,7 +1191,7 @@ @code{mouse-drag-region}, then the @code{REGION} section will be enabled. -In addition, @code{REGIONTEXT} will be set the the text in the region, +In addition, @code{REGIONTEXT} will be set to the text in the region, and that region of text will be ``killed'' from the current buffer. If standard-output is NOT the current buffer, then the region will not === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-06-22 05:43:58 +0000 +++ lisp/ChangeLog 2014-06-22 23:12:17 +0000 @@ -1,3 +1,9 @@ +2014-06-22 Mario Lang + + * textmodes/rst.el (rst-comment-region): From from -> from. + + * net/tramp-adb.el (tramp-adb-send-command-and-check): And and -> and. + 2013-06-22 Dmitry Antipov * electric.el (electric-layout-post-self-insert-function): === modified file 'lisp/net/tramp-adb.el' --- lisp/net/tramp-adb.el 2014-06-15 15:47:35 +0000 +++ lisp/net/tramp-adb.el 2014-06-22 23:12:17 +0000 @@ -1032,7 +1032,7 @@ (defun tramp-adb-send-command-and-check (vec command) - "Run COMMAND and and check its exit status. + "Run COMMAND and check its exit status. Sends `echo $?' along with the COMMAND for checking the exit status. If COMMAND is nil, just sends `echo $?'. Returns the exit status found." (tramp-adb-send-command === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2014-06-22 05:43:58 +0000 +++ lisp/org/ChangeLog 2014-06-22 23:12:17 +0000 @@ -1,3 +1,9 @@ +2014-06-22 Mario Lang + + * org-list.el (org-list-insert-item): The the -> the. + + * org-bibtex.el (org-bibtex-fields): The the -> the. + 2013-06-22 Dmitry Antipov * ob-core.el (org-babel-insert-result): Prefer point-min-marker === modified file 'lisp/org/org-bibtex.el' --- lisp/org/org-bibtex.el 2014-04-22 14:07:45 +0000 +++ lisp/org/org-bibtex.el 2014-06-22 23:12:17 +0000 @@ -203,7 +203,7 @@ (:pages . "One or more page numbers or range of numbers, such as 42-111 or 7,41,73-97 or 43+ (the ‘+’ in this last example indicates pages following that don’t form simple range). BibTEX requires double dashes for page ranges (--).") (:publisher . "The publisher’s name.") (:school . "The name of the school where a thesis was written.") - (:series . "The name of a series or set of books. When citing an entire book, the the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.") + (:series . "The name of a series or set of books. When citing an entire book, the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.") (:title . "The work’s title, typed as explained in the LaTeX book.") (:type . "The type of a technical report for example, 'Research Note'.") (:volume . "The volume of a journal or multi-volume book.") === modified file 'lisp/org/org-list.el' --- lisp/org/org-list.el 2014-01-12 05:29:11 +0000 +++ lisp/org/org-list.el 2014-06-22 23:12:17 +0000 @@ -1254,7 +1254,7 @@ If POS is before first character after bullet of the item, the new item will be created before the current one. -STRUCT is the list structure. PREVS is the the alist of previous +STRUCT is the list structure. PREVS is the alist of previous items, as returned by `org-list-prevs-alist'. Insert a checkbox if CHECKBOX is non-nil, and string AFTER-BULLET === modified file 'lisp/textmodes/rst.el' --- lisp/textmodes/rst.el 2014-04-28 15:04:49 +0000 +++ lisp/textmodes/rst.el 2014-06-22 23:12:17 +0000 @@ -3121,7 +3121,7 @@ (defun rst-comment-region (beg end &optional arg) "Comment or uncomment the current region. -Region is from from BEG to END. Uncomment if ARG." +Region is from BEG to END. Uncomment if ARG." (save-excursion (if (consp arg) (rst-uncomment-region beg end arg) === modified file 'src/ChangeLog' --- src/ChangeLog 2014-06-22 05:00:14 +0000 +++ src/ChangeLog 2014-06-22 23:12:17 +0000 @@ -1,3 +1,7 @@ +2014-06-22 Mario Lang + + * w32fns.c (Fw32_shell_execute): The the -> the. + 2014-06-22 Dmitry Antipov * xmenu.c (mouse_position_for_popup): === modified file 'src/w32fns.c' --- src/w32fns.c 2014-05-26 02:28:09 +0000 +++ src/w32fns.c 2014-06-22 23:12:17 +0000 @@ -6894,7 +6894,7 @@ \"runas\" - run DOCUMENT, which must be an excutable file, with elevated privileges (a.k.a. \"as Administrator\"). \"properties\" - - open the the property sheet dialog for DOCUMENT. + - open the property sheet dialog for DOCUMENT. nil - invoke the default OPERATION, or \"open\" if default is not defined or unavailable. ------------------------------------------------------------ revno: 117376 committer: Dmitry Antipov branch nick: trunk timestamp: Sun 2014-06-22 09:43:58 +0400 message: * lisp/electric.el (electric-layout-post-self-insert-function): * lisp/emacs-lisp/ert.el (ert--insert-infos): * lisp/obsolete/vi.el (vi-set-mark): * lisp/term.el (term-handle-scroll): * lisp/textmodes/bibtex.el (bibtex-fill-field, bibtex-fill-entry): * lisp/gnus/gnus-sum.el (gnus-summary-edit-article-done): * lisp/org/org-mouse.el (org-mouse-do-remotely): * lisp/wid-edit.el (widget-editable-list-value-create): Prefer point-marker to copy-marker of point. * lisp/ob-core.el (org-babel-insert-result): Prefer point-min-marker and point-max-marker. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-06-21 19:45:59 +0000 +++ lisp/ChangeLog 2014-06-22 05:43:58 +0000 @@ -1,3 +1,13 @@ +2013-06-22 Dmitry Antipov + + * electric.el (electric-layout-post-self-insert-function): + * emacs-lisp/ert.el (ert--insert-infos): + * obsolete/vi.el (vi-set-mark): + * term.el (term-handle-scroll): + * textmodes/bibtex.el (bibtex-fill-field, bibtex-fill-entry): + * wid-edit.el (widget-editable-list-value-create): Prefer + point-marker to copy-marker of point. + 2014-06-21 Fabián Ezequiel Gallina Fix completion retrieval parsing (bug#17209). === modified file 'lisp/electric.el' --- lisp/electric.el 2014-05-09 18:03:21 +0000 +++ lisp/electric.el 2014-06-22 05:43:58 +0000 @@ -368,7 +368,7 @@ (setq pos (electric--after-char-pos)) ;; Not in a string or comment. (not (nth 8 (save-excursion (syntax-ppss pos))))) - (let ((end (copy-marker (point))) + (let ((end (point-marker)) (sym (if (functionp rule) (funcall rule) rule))) (set-marker-insertion-type end (not (eq sym 'after-stay))) (goto-char pos) === modified file 'lisp/emacs-lisp/ert.el' --- lisp/emacs-lisp/ert.el 2014-02-26 02:02:21 +0000 +++ lisp/emacs-lisp/ert.el 2014-06-22 05:43:58 +0000 @@ -1320,7 +1320,7 @@ (unwind-protect (progn (insert message "\n") - (setq end (copy-marker (point))) + (setq end (point-marker)) (goto-char begin) (insert " " prefix) (forward-line 1) === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-06-05 22:43:36 +0000 +++ lisp/gnus/ChangeLog 2014-06-22 05:43:58 +0000 @@ -1,3 +1,8 @@ +2013-06-22 Dmitry Antipov + + * gnus-sum.el (gnus-summary-edit-article-done): + Prefer point-marker to copy-marker of point. + 2014-06-05 Katsumi Yamaoka * gnus-art.el (gnus-article-edit-part): Don't modifiy markers. === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2014-03-24 00:35:00 +0000 +++ lisp/gnus/gnus-sum.el 2014-06-22 05:43:58 +0000 @@ -10613,7 +10613,7 @@ (let ((lines (count-lines (point) (point-max))) (length (- (point-max) (point))) (case-fold-search t) - (body (copy-marker (point)))) + (body (point-marker))) (goto-char (point-min)) (when (re-search-forward "^content-length:[ \t]\\([0-9]+\\)" body t) (delete-region (match-beginning 1) (match-end 1)) === modified file 'lisp/obsolete/vi.el' --- lisp/obsolete/vi.el 2014-06-02 01:02:21 +0000 +++ lisp/obsolete/vi.el 2014-06-22 05:43:58 +0000 @@ -1200,7 +1200,7 @@ (let ((aelt (assq char vi-mark-alist))) (if aelt (move-marker (cdr aelt) (point)) ; fixed 6/12/86 - (setq aelt (cons char (copy-marker (point)))) + (setq aelt (cons char (point-marker))) (setq vi-mark-alist (cons aelt vi-mark-alist)))))) (defun vi-find-matching-paren () === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2014-05-29 03:45:29 +0000 +++ lisp/org/ChangeLog 2014-06-22 05:43:58 +0000 @@ -1,3 +1,10 @@ +2013-06-22 Dmitry Antipov + + * ob-core.el (org-babel-insert-result): Prefer point-min-marker + and point-max-marker. + * org-mouse.el (org-mouse-do-remotely): Prefer point-marker + to copy-marker of point. + 2014-05-29 Stefan Monnier * org-compat.el (org-font-lock-ensure): New function. === modified file 'lisp/org/ob-core.el' --- lisp/org/ob-core.el 2014-04-22 14:07:45 +0000 +++ lisp/org/ob-core.el 2014-06-22 05:43:58 +0000 @@ -2039,8 +2039,8 @@ t info hash indent))) (results-switches (cdr (assoc :results_switches (nth 2 info)))) - (visible-beg (copy-marker (point-min))) - (visible-end (copy-marker (point-max))) + (visible-beg (point-min-marker)) + (visible-end (point-max-marker)) ;; When results exist outside of the current visible ;; region of the buffer, be sure to widen buffer to ;; update them. === modified file 'lisp/org/org-mouse.el' --- lisp/org/org-mouse.el 2014-01-01 07:43:34 +0000 +++ lisp/org/org-mouse.el 2014-06-22 05:43:58 +0000 @@ -1005,7 +1005,7 @@ (let ((endmarker (with-current-buffer buffer (outline-end-of-subtree) (forward-char 1) - (copy-marker (point))))) + (point-marker)))) (org-with-remote-undo buffer (with-current-buffer buffer (widen) @@ -1015,7 +1015,7 @@ (and (outline-next-heading) (org-flag-heading nil))) ; show the next heading (org-back-to-heading) - (setq marker (copy-marker (point))) + (setq marker (point-marker)) (goto-char (max (point-at-bol) (- (point-at-eol) anticol))) (funcall command) (message "_cmd: %S" org-mouse-cmd) === modified file 'lisp/org/org-table.el' --- lisp/org/org-table.el 2014-04-22 14:07:45 +0000 +++ lisp/org/org-table.el 2014-06-22 05:43:58 +0000 @@ -3182,9 +3182,9 @@ (save-excursion ;; Insert a temporary formula at right after the table (goto-char (org-table-TBLFM-begin)) - (setq s (set-marker (make-marker) (point))) + (setq s (point-marker)) (insert (concat formula "\n")) - (setq e (set-marker (make-marker) (point))) + (setq e (point-marker)) ;; Recalculate the table (beginning-of-line 0) ; move to the inserted line (skip-chars-backward " \r\n\t") === modified file 'lisp/term.el' --- lisp/term.el 2014-04-23 02:22:06 +0000 +++ lisp/term.el 2014-06-22 05:43:58 +0000 @@ -3632,7 +3632,7 @@ (if (< down 0) term-scroll-start term-scroll-end)))) (when (or (and (< down 0) (< scroll-needed 0)) (and (> down 0) (> scroll-needed 0))) - (let ((save-point (copy-marker (point))) (save-top)) + (let ((save-point (point-marker)) (save-top)) (goto-char term-home-marker) (cond (term-scroll-with-delete (if (< down 0) === modified file 'lisp/textmodes/bibtex.el' --- lisp/textmodes/bibtex.el 2014-02-28 06:51:04 +0000 +++ lisp/textmodes/bibtex.el 2014-06-22 05:43:58 +0000 @@ -4840,7 +4840,7 @@ If optional prefix JUSTIFY is non-nil justify as well. In BibTeX mode this function is bound to `fill-paragraph-function'." (interactive "*P") - (let ((pnt (copy-marker (point))) + (let ((pnt (point-marker)) (bounds (bibtex-enclosing-field t))) (bibtex-fill-field-bounds bounds justify) (goto-char pnt))) @@ -4852,7 +4852,7 @@ column `bibtex-text-indentation' and continuation lines start here, too. If `bibtex-align-at-equal-sign' is non-nil, align equal signs, too." (interactive "*") - (let ((pnt (copy-marker (point))) + (let ((pnt (point-marker)) (beg (bibtex-beginning-of-entry)) ; move point bounds) (bibtex-delete-whitespace) === modified file 'lisp/wid-edit.el' --- lisp/wid-edit.el 2014-02-10 01:34:22 +0000 +++ lisp/wid-edit.el 2014-06-22 05:43:58 +0000 @@ -2626,7 +2626,7 @@ (let* ((value (widget-get widget :value)) (type (nth 0 (widget-get widget :args))) children) - (widget-put widget :value-pos (copy-marker (point))) + (widget-put widget :value-pos (point-marker)) (set-marker-insertion-type (widget-get widget :value-pos) t) (while value (let ((answer (widget-match-inline type value)))