Merge from emacs-24; up to 2014-04-04T23:31:02Z!joaotavora@gmail.com

ChangeLog

+2014-04-11  Glenn Morris  <rgm@gnu.org>
+
+	* make-dist: Do not distribute generated admin/grammars/Makefile.
+	Do distribute lib-src/update-game-score.exe.manifest.
+
+2014-04-11  Ken Brown  <kbrown@cornell.edu>
+
+	* configure.ac (EMACS_MANIFEST): Revert last change (but leave
+	UPDATE_MANIFEST empty).
+
 2014-04-07  Ken Brown  <kbrown@cornell.edu>
 
 	* configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these

configure.ac

@@ -1835,6 +1835,10 @@ if test "${HAVE_W32}" = "yes"; then
   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 @@ if test "${HAVE_W32}" = "yes"; then
     # 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"

etc/ChangeLog

+2014-04-11  Glenn Morris  <rgm@gnu.org>
+
+	* 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  <michael.albinus@gmx.de>
 
 	* NEWS: `url-handler-mode' passes operations to Tramp for some

etc/refcards/cs-dired-ref.tex

@@ -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

etc/refcards/cs-refcard.tex

@@ -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

etc/refcards/cs-survival.tex

@@ -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

etc/refcards/sk-dired-ref.tex

@@ -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

etc/refcards/sk-refcard.tex

@@ -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

etc/refcards/sk-survival.tex

@@ -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

lisp/ChangeLog

+2014-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	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  <fengli@gmail.com>  (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  <michael.albinus@gmx.de>
+
+	* 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  <monnier@iro.umontreal.ca>
 	* emulation/cua-base.el (<toplevel>, cua--pre-command-handler-1):
@@ -1186,7 +1209,7 @@
 2014-03-04  Michal Nazarewicz  <mina86@mina86.com>
-	* 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  <lekktu@gmail.com>
@@ -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  <monnier@iro.umontreal.ca>

lisp/elec-pair.el

@@ -343,7 +343,7 @@ If point is not enclosed by any lists, return ((t) . (t))."
     (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

lisp/net/tramp-sh.el

@@ -4836,9 +4836,10 @@ Return ATTR."
 	(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."

lisp/net/tramp.el

@@ -2106,7 +2106,16 @@ ARGS are the arguments OPERATION has been called with."
 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 @@ preventing reentrant calls of Tramp.")
   "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.

lisp/nxml/rng-cmpct.el

@@ -363,7 +363,7 @@ OVERRIDE is either nil, require or t."
 	    "*")))
 
 (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 @@ Current token after parse is token following ]."
 (provide 'rng-cmpct)
 
 ;;; rng-cmpct.el
-

lisp/progmodes/pascal.el

@@ -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

lisp/vc/ediff-diff.el

@@ -587,7 +587,6 @@ one optional arguments, diff-number to refine.")
 	    (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 @@ one optional arguments, diff-number to refine.")
 		  '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)

lisp/vc/ediff-init.el

@@ -707,9 +707,6 @@ shown in brighter colors."
 ;; 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 @@ this variable represents.")
 (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.")

lisp/vc/ediff-util.el

@@ -3023,8 +3023,6 @@ Hit \\[ediff-recenter] to reset the windows afterward."
 	(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

make-dist

@@ -385,7 +385,8 @@ echo "Making links to \`lib-src'"
  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 \`lwlib'"
 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

nt/ChangeLog

+2014-04-11  Ken Brown  <kbrown@cornell.edu>
+
+	* emacs.rc: Revert last change.
+
 2014-04-07  Ken Brown  <kbrown@cornell.edu>
 
 	* emacs.rc: Don't use manifest on Cygwin.  (Bug#17176)