------------------------------------------------------------ revno: 116968 fixes bug: http://debbugs.gnu.org/16429 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-04-10 23:51:49 -0700 message: Avoid EMACSDATA in user environment interfering with building * admin/grammars/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): * leim/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): * lisp/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): * test/automated/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2014-03-22 22:52:47 +0000 +++ admin/ChangeLog 2014-04-11 06:51:49 +0000 @@ -1,3 +1,7 @@ +2014-04-11 Glenn Morris + + * grammars/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport. + 2014-03-22 Glenn Morris * quick-install-emacs (AVOID): Remove testfile and test-distrib. === modified file 'admin/grammars/Makefile.in' --- admin/grammars/Makefile.in 2014-01-01 07:43:34 +0000 +++ admin/grammars/Makefile.in 2014-04-11 06:51:49 +0000 @@ -28,6 +28,9 @@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ +# Prevent any settings in the user environment causing problems. +unexport EMACSDATA EMACSDOC EMACSPATH + EMACS = ${top_builddir}/src/emacs emacs = EMACSLOADPATH= "${EMACS}" -batch --no-site-file --no-site-lisp === modified file 'leim/ChangeLog' --- leim/ChangeLog 2014-01-26 00:47:40 +0000 +++ leim/ChangeLog 2014-04-11 06:51:49 +0000 @@ -1,3 +1,7 @@ +2014-04-11 Glenn Morris + + * Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport. + 2014-01-20 Paul Eggert Revert some of the CANNOT_DUMP fix (Bug#16494). === modified file 'leim/Makefile.in' --- leim/Makefile.in 2014-01-20 07:56:28 +0000 +++ leim/Makefile.in 2014-04-11 06:51:49 +0000 @@ -29,6 +29,9 @@ # Where the generated files go. leimdir = ${srcdir}/../lisp/leim +# Prevent any settings in the user environment causing problems. +unexport EMACSDATA EMACSDOC EMACSPATH + # Which Emacs to use to convert TIT files to Emacs Lisp files, # and generate the file leim-list.el. EMACS = ../src/emacs === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-04-11 06:43:20 +0000 +++ lisp/ChangeLog 2014-04-11 06:51:49 +0000 @@ -1,3 +1,7 @@ +2014-04-11 Glenn Morris + + * Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport. (Bug#16429) + 2014-04-11 Stefan Monnier Ediff's overlay priorities cause more trouble than they solve. === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2014-03-29 00:53:32 +0000 +++ lisp/Makefile.in 2014-04-11 06:51:49 +0000 @@ -107,6 +107,9 @@ $(lisp)/emacs-lisp/bytecomp.elc \ $(lisp)/emacs-lisp/autoload.elc +# Prevent any settings in the user environment causing problems. +unexport EMACSDATA EMACSDOC EMACSPATH + # The actual Emacs command run in the targets below. # Prevent any setting of EMACSLOADPATH in user environment causing problems. emacs = EMACSLOADPATH= '$(EMACS)' $(EMACSOPT) === modified file 'test/ChangeLog' --- test/ChangeLog 2014-04-11 06:43:20 +0000 +++ test/ChangeLog 2014-04-11 06:51:49 +0000 @@ -1,3 +1,7 @@ +2014-04-11 Glenn Morris + + * automated/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport. + 2014-04-11 Paul Eggert * automated/electric-tests.el: Fix spelling error in test name. === modified file 'test/automated/Makefile.in' --- test/automated/Makefile.in 2014-01-01 07:43:34 +0000 +++ test/automated/Makefile.in 2014-04-11 06:51:49 +0000 @@ -41,6 +41,9 @@ # Extra flags to pass to the byte compiler. BYTE_COMPILE_EXTRA_FLAGS = +# Prevent any settings in the user environment causing problems. +unexport EMACSDATA EMACSDOC EMACSPATH + # The actual Emacs command run in the targets below. # Prevent any setting of EMACSLOADPATH in user environment causing problems. emacs = EMACSLOADPATH= LC_ALL=C EMACS_TEST_DIRECTORY=$(srcdir) "$(EMACS)" $(EMACSOPT) ------------------------------------------------------------ revno: 116967 [merge] committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-04-10 23:43:20 -0700 message: Merge from emacs-24; up to r116940 diff: === modified file 'ChangeLog' --- ChangeLog 2014-04-07 21:19:31 +0000 +++ ChangeLog 2014-04-11 06:43:20 +0000 @@ -1,3 +1,13 @@ +2014-04-11 Glenn Morris + + * make-dist: Do not distribute generated admin/grammars/Makefile. + Do distribute lib-src/update-game-score.exe.manifest. + +2014-04-11 Ken Brown + + * configure.ac (EMACS_MANIFEST): Revert last change (but leave + UPDATE_MANIFEST empty). + 2014-04-07 Ken Brown * configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these === modified file 'configure.ac' --- configure.ac 2014-04-07 20:54:16 +0000 +++ configure.ac 2014-04-11 06:43:20 +0000 @@ -1835,6 +1835,10 @@ W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o" W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o" EMACSRES="emacs.res" + case "$canonical" in + x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;; + *) EMACS_MANIFEST="emacs-x86.manifest" ;; + esac if test "${opsys}" = "cygwin"; then W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32" W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool" @@ -1842,10 +1846,6 @@ # the rc file), not a linker script. W32_RES_LINK="-Wl,emacs.res" else - case "$canonical" in - x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;; - *) EMACS_MANIFEST="emacs-x86.manifest" ;; - esac UPDATE_MANIFEST=update-game-score.exe.manifest W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o" W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32" === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-04-01 13:20:20 +0000 +++ etc/ChangeLog 2014-04-11 06:43:20 +0000 @@ -1,3 +1,10 @@ +2014-04-11 Glenn Morris + + * refcards/cs-dired-ref.tex, refcards/cs-refcard.tex: + * refcards/cs-survival.tex, refcards/sk-dired-ref.tex: + * refcards/sk-refcard.tex, refcards/sk-survival.tex: + Input "utf8off", which seems to be needed. + 2014-04-01 Michael Albinus * NEWS: `url-handler-mode' passes operations to Tramp for some === modified file 'etc/refcards/cs-dired-ref.tex' --- etc/refcards/cs-dired-ref.tex 2014-01-01 07:43:34 +0000 +++ etc/refcards/cs-dired-ref.tex 2014-04-11 06:09:12 +0000 @@ -31,6 +31,11 @@ % Czech hyphenation rules applied \chyph +% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian) +% aborts with: "! UTF-8 INPUT IS CORRUPTED ! +% May be you are using another input encoding" +\input utf8off + % This file can be printed with 1, 2, or 3 columns per page. % Specify how many you want here. \newcount\columnsperpage === modified file 'etc/refcards/cs-refcard.tex' --- etc/refcards/cs-refcard.tex 2014-01-01 07:43:34 +0000 +++ etc/refcards/cs-refcard.tex 2014-04-11 06:09:12 +0000 @@ -49,6 +49,11 @@ % Czech hyphenation rules applied \chyph +% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian) +% aborts with: "! UTF-8 INPUT IS CORRUPTED ! +% May be you are using another input encoding" +\input utf8off + % This file can be printed with 1, 2, or 3 columns per page. % Specify how many you want here. \newcount\columnsperpage === modified file 'etc/refcards/cs-survival.tex' --- etc/refcards/cs-survival.tex 2014-01-01 07:43:34 +0000 +++ etc/refcards/cs-survival.tex 2014-04-11 06:09:12 +0000 @@ -54,6 +54,11 @@ % Czech hyphenation rules applied \chyph +% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian) +% aborts with: "! UTF-8 INPUT IS CORRUPTED ! +% May be you are using another input encoding" +\input utf8off + \input emacsver.tex \def\copyrightnotice{\penalty-1\vfill === modified file 'etc/refcards/sk-dired-ref.tex' --- etc/refcards/sk-dired-ref.tex 2014-01-01 07:43:34 +0000 +++ etc/refcards/sk-dired-ref.tex 2014-04-11 06:09:12 +0000 @@ -32,6 +32,11 @@ % Slovak hyphenation rules applied \shyph +% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian) +% aborts with: "! UTF-8 INPUT IS CORRUPTED ! +% May be you are using another input encoding" +\input utf8off + % This file can be printed with 1, 2, or 3 columns per page. % Specify how many you want here. \newcount\columnsperpage === modified file 'etc/refcards/sk-refcard.tex' --- etc/refcards/sk-refcard.tex 2014-01-01 07:43:34 +0000 +++ etc/refcards/sk-refcard.tex 2014-04-11 06:09:12 +0000 @@ -50,6 +50,11 @@ % Slovak hyphenation rules applied \shyph +% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian) +% aborts with: "! UTF-8 INPUT IS CORRUPTED ! +% May be you are using another input encoding" +\input utf8off + % This file can be printed with 1, 2, or 3 columns per page. % Specify how many you want here. \newcount\columnsperpage === modified file 'etc/refcards/sk-survival.tex' --- etc/refcards/sk-survival.tex 2014-01-01 07:43:34 +0000 +++ etc/refcards/sk-survival.tex 2014-04-11 06:09:12 +0000 @@ -55,6 +55,11 @@ % Slovak hyphenation rules applied \shyph +% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian) +% aborts with: "! UTF-8 INPUT IS CORRUPTED ! +% May be you are using another input encoding" +\input utf8off + \input emacsver.tex \def\copyrightnotice{\penalty-1\vfill === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-04-11 01:06:35 +0000 +++ lisp/ChangeLog 2014-04-11 06:43:20 +0000 @@ -1,5 +1,28 @@ 2014-04-11 Stefan Monnier + Ediff's overlay priorities cause more trouble than they solve. + * vc/ediff-init.el (ediff-shadow-overlay-priority): Remove variable. + (ediff-highest-priority): Remove function (bug#17234). + * vc/ediff-util.el (ediff-highlight-diff-in-one-buffer): + * vc/ediff-diff.el (ediff-set-diff-overlays-in-one-buffer) + (ediff-set-fine-diff-properties-in-one-buffer): Don't mess with + overlay priorities. + +2014-04-11 Feng Li (tiny change) + + * progmodes/pascal.el (pascal-font-lock-keywords): Fix incorrect format + entry; use symbol boundaries to avoid mis-matches. + +2014-04-11 Michael Albinus + + * net/tramp.el (tramp-file-name-handler) + (tramp-completion-file-name-handler): Avoid recursive loading. + + * net/tramp-sh.el (tramp-make-copy-program-file-name): + Quote result also locally. + +2014-04-11 Stefan Monnier + * emulation/cua-base.el (, cua--pre-command-handler-1): Remove left-over code. @@ -1186,7 +1209,7 @@ 2014-03-04 Michal Nazarewicz - * binding.el: Add comment describing why C-d binds to `delete-char'. + * bindings.el: Add comment describing why C-d binds to `delete-char'. * simple.el (delete-forward-char): Mark as interactive-only. 2014-03-03 Juanma Barranquero @@ -2243,7 +2266,7 @@ * ielm.el (ielm-mode-hook): * emacs-lisp/lisp-mode.el (emacs-lisp-mode-hook) (lisp-interaction-mode-hook): - * progmodes/cfengine.e (cfengine3-documentation-function): + * progmodes/cfengine.el (cfengine3-documentation-function): Replace obsolete alias `turn-on-eldoc-mode' with `eldoc-mode'. 2014-01-30 Stefan Monnier === modified file 'lisp/elec-pair.el' --- lisp/elec-pair.el 2014-04-07 20:54:16 +0000 +++ lisp/elec-pair.el 2014-04-11 06:43:20 +0000 @@ -343,7 +343,7 @@ (cons innermost outermost))) (defvar electric-pair-string-bound-function 'point-max - "Next buffer position where strings are syntatically unexpected. + "Next buffer position where strings are syntactically unexpected. Value is a function called with no arguments and returning a buffer position. Major modes should set this variable buffer-locally if they experience slowness with === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2014-03-25 09:49:37 +0000 +++ lisp/net/tramp-sh.el 2014-04-10 07:17:40 +0000 @@ -4836,9 +4836,10 @@ (host (tramp-file-name-real-host vec)) (localname (tramp-shell-quote-argument (tramp-file-name-localname vec)))) - (if (not (zerop (length user))) - (format "%s@%s:%s" user host localname) - (format "%s:%s" host localname)))) + (shell-quote-argument + (if (not (zerop (length user))) + (format "%s@%s:%s" user host localname) + (format "%s:%s" host localname))))) (defun tramp-method-out-of-band-p (vec size) "Return t if this is an out-of-band method, nil otherwise." === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2014-03-25 08:16:49 +0000 +++ lisp/net/tramp.el 2014-04-10 07:17:40 +0000 @@ -2106,7 +2106,16 @@ Falls back to normal file name handler if no Tramp file name handler exists." (if tramp-mode (save-match-data - (let* ((filename + (let* ((default-directory + ;; Some packages set the default directory to a + ;; remote path, before tramp.el has been loaded. + ;; This results in recursive loading. Therefore, we + ;; set `default-directory' to a local path. `args' + ;; could also be remote when loading tramp.el, but + ;; that would be such perverse we don't care about. + (if load-in-progress + temporary-file-directory default-directory)) + (filename (tramp-replace-environment-variables (apply 'tramp-file-name-for-operation operation args))) (completion (tramp-completion-mode-p)) @@ -2218,8 +2227,11 @@ "Invoke Tramp file name completion handler. Falls back to normal file name handler if no Tramp file name handler exists." ;; We bind `directory-sep-char' here for XEmacs on Windows, which - ;; would otherwise use backslash. + ;; would otherwise use backslash. For `default-directory', see + ;; comment in `tramp-file-name-handler'. (let ((directory-sep-char ?/) + (default-directory + (if load-in-progress temporary-file-directory default-directory)) (fn (assoc operation tramp-completion-file-name-handler-alist))) (if (and ;; When `tramp-mode' is not enabled, we don't do anything. === modified file 'lisp/nxml/rng-cmpct.el' --- lisp/nxml/rng-cmpct.el 2014-03-21 06:56:55 +0000 +++ lisp/nxml/rng-cmpct.el 2014-04-10 19:12:34 +0000 @@ -363,7 +363,7 @@ "*"))) (defun rng-c-process-escapes () - ;; Check for any nuls, since we will use nul chars + ;; Check for any NULs, since we will use NUL chars ;; for internal purposes. (let ((pos (search-forward "\C-@" nil t))) (and pos @@ -932,4 +932,3 @@ (provide 'rng-cmpct) ;;; rng-cmpct.el - === modified file 'lisp/progmodes/pascal.el' --- lisp/progmodes/pascal.el 2014-03-14 00:22:33 +0000 +++ lisp/progmodes/pascal.el 2014-04-10 13:56:28 +0000 @@ -166,21 +166,19 @@ (3 font-lock-function-name-face)) ;; ("type" "const" "real" "integer" "char" "boolean" "var" ;; "record" "array" "file") - (,(concat "\\<\\(array\\|boolean\\|c\\(har\\|onst\\)\\|file\\|" - "integer\\|re\\(al\\|cord\\)\\|type\\|var\\)\\>") - font-lock-type-face) - ("\\<\\(label\\|external\\|forward\\)\\>" . font-lock-constant-face) - ("\\<\\([0-9]+\\)[ \t]*:" 1 font-lock-function-name-face) + (,(concat "\\_<\\(array\\|boolean\\|c\\(har\\|onst\\)\\|file\\|" + "integer\\|re\\(al\\|cord\\)\\|type\\|var\\)\\_>") + . font-lock-type-face) + ("\\_<\\(label\\|external\\|forward\\)\\_>" . font-lock-constant-face) + ("\\_<\\([0-9]+\\)[ \t]*:" 1 font-lock-function-name-face) ;; ("of" "to" "for" "if" "then" "else" "case" "while" ;; "do" "until" "and" "or" "not" "in" "with" "repeat" "begin" "end") - ,(concat "\\<\\(" + ,(concat "\\_<\\(" "and\\|begin\\|case\\|do\\|e\\(lse\\|nd\\)\\|for\\|i[fn]\\|" "not\\|o[fr]\\|repeat\\|t\\(hen\\|o\\)\\|until\\|w\\(hile\\|ith\\)" - "\\)\\>") - ("\\<\\(goto\\)\\>[ \t]*\\([0-9]+\\)?" - 1 font-lock-keyword-face) - ("\\<\\(goto\\)\\>[ \t]*\\([0-9]+\\)?" - 2 font-lock-keyword-face t)) + "\\)\\_>") + ("\\_<\\(goto\\)\\_>[ \t]*\\([0-9]+\\)?" + (1 font-lock-keyword-face) (2 font-lock-keyword-face t))) "Additional expressions to highlight in Pascal mode.") (defconst pascal--syntax-propertize === modified file 'lisp/vc/ediff-diff.el' --- lisp/vc/ediff-diff.el 2014-01-01 07:43:34 +0000 +++ lisp/vc/ediff-diff.el 2014-04-10 19:15:01 +0000 @@ -587,7 +587,6 @@ (setq pt-saved (ediff-with-current-buffer buff (point))))) (setq overlay (ediff-make-bullet-proof-overlay begin end buff)) - (ediff-overlay-put overlay 'priority ediff-shadow-overlay-priority) (ediff-overlay-put overlay 'ediff-diff-num current-diff) (if (and (ediff-has-face-support-p) ediff-use-faces ediff-highlight-all-diffs) @@ -822,20 +821,9 @@ 'default (ediff-get-symbol-from-alist buf-type ediff-fine-diff-face-alist) - )) - (priority (if default - 0 - (1+ (or (ediff-overlay-get - (symbol-value - (ediff-get-symbol-from-alist - buf-type - ediff-current-diff-overlay-alist)) - 'priority) - 0))))) - (mapcar (lambda (overl) - (ediff-set-overlay-face overl face) - (ediff-overlay-put overl 'priority priority)) - fine-diff-vector))) + ))) + (dolist (overl fine-diff-vector) + (ediff-set-overlay-face overl face)))) ;; Set overlays over the regions that denote delimiters (defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num) === modified file 'lisp/vc/ediff-init.el' --- lisp/vc/ediff-init.el 2014-02-16 03:09:27 +0000 +++ lisp/vc/ediff-init.el 2014-04-10 19:15:01 +0000 @@ -707,9 +707,6 @@ ;; List of difference overlays disturbed by working with the current diff. (defvar ediff-disturbed-overlays nil "") -;; Priority of non-selected overlays. -(defvar ediff-shadow-overlay-priority 100 "") - (defcustom ediff-version-control-package 'vc "Version control package used. Currently, Ediff supports vc.el, rcs.el, pcl-cvs.el, and generic-sc.el. The @@ -1329,34 +1326,6 @@ (ediff-defvar-local ediff-current-diff-overlay-Ancestor nil "Overlay for the current difference region in the ancestor buffer.") -;; Compute priority of a current ediff overlay. -(defun ediff-highest-priority (start end buffer) - (let ((pos (max 1 (1- start))) - ovr-list) - (if (featurep 'xemacs) - (1+ ediff-shadow-overlay-priority) - (ediff-with-current-buffer buffer - (while (< pos (min (point-max) (1+ end))) - (setq ovr-list (append (overlays-at pos) ovr-list)) - (setq pos (next-overlay-change pos))) - (+ 1 ediff-shadow-overlay-priority - (apply 'max - (cons - 1 - (mapcar - (lambda (ovr) - (if (and ovr - ;; exclude ediff overlays from priority - ;; calculation, or else priority will keep - ;; increasing - (null (ediff-overlay-get ovr 'ediff)) - (null (ediff-overlay-get ovr 'ediff-diff-num))) - ;; use the overlay priority or 0 - (or (ediff-overlay-get ovr 'priority) 0) - 0)) - ovr-list)))))))) - - (defvar ediff-toggle-read-only-function 'toggle-read-only "Function to be used to toggle read-only status of the buffer. If nil, Ediff tries using the command bound to C-x C-q.") === modified file 'lisp/vc/ediff-util.el' --- lisp/vc/ediff-util.el 2014-01-01 07:43:34 +0000 +++ lisp/vc/ediff-util.el 2014-04-10 19:15:01 +0000 @@ -3023,8 +3023,6 @@ (if (featurep 'xemacs) (ediff-move-overlay current-diff-overlay begin end-hilit) (ediff-move-overlay current-diff-overlay begin end-hilit buff)) - (ediff-overlay-put current-diff-overlay 'priority - (ediff-highest-priority begin end-hilit buff)) (ediff-overlay-put current-diff-overlay 'ediff-diff-num n) ;; unhighlight the background overlay for diff n so it won't === modified file 'make-dist' --- make-dist 2014-04-03 01:16:18 +0000 +++ make-dist 2014-04-11 06:43:20 +0000 @@ -385,7 +385,8 @@ ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src ln ChangeLog Makefile.in README ../${tempdir}/lib-src ln grep-changelog rcs2log ../${tempdir}/lib-src - ln makefile.w32-in ../${tempdir}/lib-src) + ln makefile.w32-in ../${tempdir}/lib-src + ln update-game-score.exe.manifest ../${tempdir}/lib-src) echo "Making links to \`m4'" (cd m4 @@ -451,7 +452,7 @@ echo "Making links to \`admin' and its subdirectories" for f in `find admin -type f`; do case $f in - admin/unidata/Makefile) continue ;; + */Makefile) [ -f $f.in ] && continue ;; esac ln $f $tempdir/$f done === modified file 'nt/ChangeLog' --- nt/ChangeLog 2014-04-07 21:19:31 +0000 +++ nt/ChangeLog 2014-04-11 06:43:20 +0000 @@ -1,3 +1,7 @@ +2014-04-11 Ken Brown + + * emacs.rc: Revert last change. + 2014-04-07 Ken Brown * emacs.rc: Don't use manifest on Cygwin. (Bug#17176) === modified file 'nt/emacs.rc' --- nt/emacs.rc 2014-04-07 20:54:16 +0000 +++ nt/emacs.rc 2014-04-11 06:43:20 +0000 @@ -1,12 +1,10 @@ Emacs ICON icons/emacs.ico 32649 CURSOR icons/hand.cur -#ifndef __CYGWIN__ -#ifdef WIN64 +#if defined (WIN64) || defined (__x86_64__) 1 24 "emacs-x64.manifest" #else 1 24 "emacs-x86.manifest" #endif -#endif #ifndef VS_VERSION_INFO #define VS_VERSION_INFO 1 === modified file 'src/ChangeLog' --- src/ChangeLog 2014-04-10 00:05:34 +0000 +++ src/ChangeLog 2014-04-11 06:43:20 +0000 @@ -1,3 +1,11 @@ +2014-04-11 Glenn Morris + + * keyboard.c (Fopen_dribble_file): Make file private. (Bug#17187) + +2014-04-11 Ken Brown + + * Makefile.in (EMACS_MANIFEST): Revert last change. + 2014-04-10 Daniel Colascione * puresize.h (BASE_PURESIZE): Increase. === modified file 'src/Makefile.in' --- src/Makefile.in 2014-04-03 19:10:35 +0000 +++ src/Makefile.in 2014-04-09 21:16:37 +0000 @@ -259,7 +259,7 @@ ## emacs.res if HAVE_W32 EMACSRES = @EMACSRES@ -## emacs-*.manifest if WINDOWSNT +## emacs-*.manifest if HAVE_W32 EMACS_MANIFEST = @EMACS_MANIFEST@ ## If HAVE_W32, compiler arguments for including ## the resource file in the binary. === modified file 'src/keyboard.c' --- src/keyboard.c 2014-04-09 13:21:30 +0000 +++ src/keyboard.c 2014-04-11 06:43:20 +0000 @@ -20,6 +20,7 @@ #include #include "sysstdio.h" +#include #include "lisp.h" #include "termchar.h" @@ -10082,8 +10083,18 @@ } if (!NILP (file)) { + int fd; file = Fexpand_file_name (file, Qnil); - dribble = emacs_fopen (SSDATA (file), "w"); + /* This isn't robust, since eg file could be created after we + check whether it exists but before emacs_open. + Feel free to improve it, but this is not critical. (Bug#17187) */ + if (! NILP (Ffile_exists_p (file))) + { + if (chmod (SSDATA (file), 0600) < 0) + report_file_error ("Doing chmod", file); + } + fd = emacs_open (SSDATA (file), O_WRONLY | O_CREAT | O_TRUNC, 0600); + dribble = fd < 0 ? 0 : fdopen (fd, "w"); if (dribble == 0) report_file_error ("Opening dribble", file); } === modified file 'test/ChangeLog' --- test/ChangeLog 2014-04-09 16:58:08 +0000 +++ test/ChangeLog 2014-04-11 06:43:20 +0000 @@ -1,3 +1,9 @@ +2014-04-11 Paul Eggert + + * automated/electric-tests.el: Fix spelling error in test name. + (whitespace-skipping-for-quotes-not-outside): + Rename from whitespace-skipping-for-quotes-not-ouside. + 2014-04-09 Daniel Colascione * automated/syntax-tests.el: New file. === modified file 'test/automated/electric-tests.el' --- test/automated/electric-tests.el 2014-04-09 03:37:56 +0000 +++ test/automated/electric-tests.el 2014-04-11 06:43:20 +0000 @@ -383,7 +383,7 @@ :test-in-code nil :test-in-comments t) -(define-electric-pair-test whitespace-skipping-for-quotes-not-ouside +(define-electric-pair-test whitespace-skipping-for-quotes-not-outside " \" \"" "\"-----" :expected-string "\"\" \" \"" :expected-point 2 :bindings '((electric-pair-skip-whitespace . chomp)) === modified file 'test/indent/pascal.pas' --- test/indent/pascal.pas 2014-01-10 07:10:37 +0000 +++ test/indent/pascal.pas 2014-04-10 13:56:28 +0000 @@ -29,6 +29,7 @@ // Free-pascal style comment. var x:Char = 12 /* 45; // This /* does not start a comment. var x:Char = (/ 4); // This (/ does not start a comment. +var a_to_b : integer; // 'to' should not be highlighted program CRTDemo; ------------------------------------------------------------ revno: 116966 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2014-04-10 21:06:35 -0400 message: * lisp/emulation/cua-base.el (, cua--pre-command-handler-1): Remove left-over code. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-04-11 01:05:03 +0000 +++ lisp/ChangeLog 2014-04-11 01:06:35 +0000 @@ -1,5 +1,8 @@ 2014-04-11 Stefan Monnier + * emulation/cua-base.el (, cua--pre-command-handler-1): + Remove left-over code. + * newcomment.el (comment-indent-new-line): Sink code where it's used. Reuse the previous comment's indentation unconditionally if it's on its own line. === modified file 'lisp/emulation/cua-base.el' --- lisp/emulation/cua-base.el 2014-02-12 14:48:41 +0000 +++ lisp/emulation/cua-base.el 2014-04-11 01:06:35 +0000 @@ -1156,19 +1156,6 @@ (cancel-timer cua--prefix-override-timer)) (setq cua--prefix-override-timer nil)) - (cond - ;; Only symbol commands can have necessary properties - ((not (symbolp this-command)) - nil) - - ((not (eq (get this-command 'CUA) 'move)) - nil) - - ;; Set mark if user explicitly said to do so - (cua--rectangle ;FIXME: ?? - (unless mark-active - (push-mark-command nil nil)))) - ;; Detect extension of rectangles by mouse or other movement (setq cua--buffer-and-point-before-command (if cua--rectangle (cons (current-buffer) (point))))) @@ -1367,36 +1354,6 @@ ) -;; Setup standard movement commands to be recognized by CUA. - -(dolist (cmd - '(forward-char backward-char - right-char left-char - right-word left-word - next-line previous-line - forward-word backward-word - end-of-line beginning-of-line - end-of-visual-line beginning-of-visual-line - move-end-of-line move-beginning-of-line - end-of-buffer beginning-of-buffer - scroll-up scroll-down - scroll-up-command scroll-down-command - up-list down-list backward-up-list - end-of-defun beginning-of-defun - forward-sexp backward-sexp - forward-list backward-list - forward-sentence backward-sentence - forward-paragraph backward-paragraph - ;; CC mode motion commands - c-forward-conditional c-backward-conditional - c-down-conditional c-up-conditional - c-down-conditional-with-else c-up-conditional-with-else - c-beginning-of-statement c-end-of-statement)) - (put cmd 'CUA 'move)) - -;; Only called if pc-selection-mode is t, which means pc-select is loaded. -(declare-function pc-selection-mode "pc-select" (&optional arg)) - ;; State prior to enabling cua-mode ;; Value is a list with the following elements: ;; delete-selection-mode ------------------------------------------------------------ revno: 116965 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2014-04-10 21:05:03 -0400 message: * lisp/newcomment.el (comment-indent-new-line): Sink code where it's used. Reuse the previous comment's indentation unconditionally if it's on its own line. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-04-09 16:58:08 +0000 +++ lisp/ChangeLog 2014-04-11 01:05:03 +0000 @@ -1,3 +1,9 @@ +2014-04-11 Stefan Monnier + + * newcomment.el (comment-indent-new-line): Sink code where it's used. + Reuse the previous comment's indentation unconditionally if it's on its + own line. + 2014-04-09 Daniel Colascione * emacs-lisp/lisp.el (backward-up-list): Add `escape-strings', === modified file 'lisp/newcomment.el' --- lisp/newcomment.el 2014-03-18 06:06:33 +0000 +++ lisp/newcomment.el 2014-04-11 01:05:03 +0000 @@ -1390,22 +1390,12 @@ ;; If we're not inside a comment, just try to indent. ((not compos) (indent-according-to-mode)) (t - (let* ((comment-column - ;; The continuation indentation should be somewhere between - ;; the current line's indentation (plus 2 for good measure) - ;; and the current comment's indentation, with a preference - ;; for comment-column. - (save-excursion - ;; FIXME: use prev line's info rather than first line's. - (goto-char compos) - (min (current-column) (max comment-column - (+ 2 (current-indentation)))))) - (comstart (buffer-substring compos comin)) + (let* ((comstart (buffer-substring compos comin)) (normalp (string-match (regexp-quote (comment-string-strip comment-start t t)) comstart)) - (comment-end + (comend (if normalp comment-end ;; The comment starter is not the normal comment-start ;; so we can't just use comment-end. @@ -1416,19 +1406,42 @@ (buffer-substring (save-excursion (comment-enter-backward) (point)) (point)) - nil t))))) - (comment-start comstart) - (continuep (or comment-multi-line - (cadr (assoc comment-style comment-styles)))) - ;; Force comment-continue to be recreated from comment-start. - ;; FIXME: wrong if comment-continue was set explicitly! - ;; FIXME: use prev line's continuation if available. - (comment-continue nil)) - (if (and comment-multi-line (> (length comment-end) 0)) + nil t)))))) + (if (and comment-multi-line (> (length comend) 0)) (indent-according-to-mode) (insert-and-inherit ?\n) (forward-char -1) - (comment-indent continuep) + (let* ((comment-column + ;; The continuation indentation should be somewhere + ;; between the current line's indentation (plus 2 for + ;; good measure) and the current comment's indentation, + ;; with a preference for comment-column. + (save-excursion + ;; FIXME: use prev line's info rather than first + ;; line's. + (goto-char compos) + (min (current-column) + (max comment-column + (+ 2 (current-indentation)))))) + (comment-indent-function + ;; If the previous comment is on its own line, then + ;; reuse its indentation unconditionally. + ;; Important for modes like Python/Haskell where + ;; auto-indentation is unreliable. + (if (save-excursion (goto-char compos) + (skip-chars-backward " \t") + (bolp)) + (lambda () comment-column) comment-indent-function)) + (comment-start comstart) + (comment-end comend) + (continuep (or comment-multi-line + (cadr (assoc comment-style + comment-styles)))) + ;; Recreate comment-continue from comment-start. + ;; FIXME: wrong if comment-continue was set explicitly! + ;; FIXME: use prev line's continuation if available. + (comment-continue nil)) + (comment-indent continuep)) (save-excursion (let ((pt (point))) (end-of-line) ------------------------------------------------------------ revno: 116964 committer: Daniel Colascione branch nick: trunk timestamp: Wed 2014-04-09 17:05:34 -0700 message: Increase BASE_PURESIZE diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-04-09 13:21:30 +0000 +++ src/ChangeLog 2014-04-10 00:05:34 +0000 @@ -1,3 +1,7 @@ +2014-04-10 Daniel Colascione + + * puresize.h (BASE_PURESIZE): Increase. + 2014-04-09 Stefan Monnier * keyboard.c (syms_of_keyboard): Make deactivate-mark buffer-local. === modified file 'src/puresize.h' --- src/puresize.h 2014-01-01 07:43:34 +0000 +++ src/puresize.h 2014-04-10 00:05:34 +0000 @@ -40,7 +40,7 @@ #endif #ifndef BASE_PURESIZE -#define BASE_PURESIZE (1700000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) +#define BASE_PURESIZE (1800000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) #endif /* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */ ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.