Merge from emacs-24; up to 2014-04-16T15:28:26Z!monnier@iro.umontreal.ca

14 files changed, 123 insertions, 87 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 233a72e79df..f740e7f23df 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,63 @@
+2014-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/perl-mode.el (perl-calculate-indent): Don't auto-indent in
+        here-documents (bug#17262).
+
+2014-04-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * term/pc-win.el (x-list-fonts, x-get-selection-value):
+        Provide doc strings, as required by snarf-documentation.
+
+2014-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * ps-def.el (ps-generate-postscript-with-faces1): Use the new `sorted'
+        arg of overlays-at.  Use `invisible-p'.
+
+        * obsolete/lucid.el (extent-at):
+        * htmlfontify.el (hfy-overlay-props-at): Use the new `sorted' arg of
+        overlays-at.
+        (hfy-fontify-buffer): Remove unused var `orig-ovls'.
+
+2014-04-16  João Távora  <joaotavora@gmail.com>
+
+        * net/shr.el (shr-expand-url): Use `expand-file-name' for relative
+        links.  (Bug#17217).
+
+2014-04-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):
+        Use mapc to loop over a vector.  (Bug#17257).
+
+2014-04-16  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-handle-file-truename): Revert previous
+        patch, there are new problems with file names containing spaces.
+        Get rid of backticks.  (Bug#17238)
+
+2014-04-16  João Távora  <joaotavora@gmail.com>
+
+        * elec-pair.el (electric-pair--syntax-ppss): Simplify and fix
+        possible bug.
+
+2014-04-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * frame.el (blink-cursor-blinks, blink-cursor-blinks-done): Doc fixes.
+        (blink-cursor-mode): Mention customization variables and the
+        effect of 'blink-cursor-blinks'.
+
+2014-04-16  Barry O'Reilly  <gundaetiapo@gmail.com>
+
+        * simple.el (undo): Prevent insertion of identity mapping into
+        undo-equiv-table so as undo-only does not inf loop in the presence
+        of consecutive nils in undo list.
+
+2014-04-16  Matthias Dahl  <matthias.dahl@binary-island.eu>
+
+        * faces.el (make-face): Deprecate optional argument as it is no
+        longer needed/used since the conditional X resources handling
+        has been pushed down to make-face-x-resource-internal itself.
+        (make-empty-face): Don't pass optional argument to make-face.
+
 2014-04-16  Karl Fogel  <kfogel@red-bean.com>
 
         * savehist.el (savehist-save): Remove workaround for a read-passwd
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index 04e1840c0a5..42b8a912cc4 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -226,10 +226,9 @@ WHERE is a list defaulting to '(string comment) and indicates
 when to fallback to `parse-partial-sexp'."
   (let* ((pos (or pos (point)))
          (where (or where '(string comment)))
-         (quick-ppss (syntax-ppss))
-         (quick-ppss-at-pos (syntax-ppss pos))
-         (in-string (and (nth 3 quick-ppss-at-pos) (memq 'string where)))
-         (in-comment (and (nth 4 quick-ppss-at-pos) (memq 'comment where)))
+         (quick-ppss (syntax-ppss pos))
+         (in-string (and (nth 3 quick-ppss) (memq 'string where)))
+         (in-comment (and (nth 4 quick-ppss) (memq 'comment where)))
          (s-or-c-start (cond (in-string
                               (1+ (nth 8 quick-ppss)))
                              (in-comment
@@ -243,7 +242,7 @@ when to fallback to `parse-partial-sexp'."
       ;; HACK! cc-mode apparently has some `syntax-ppss' bugs
       (if (memq major-mode '(c-mode c++ mode))
           (parse-partial-sexp (point-min) pos)
-        quick-ppss-at-pos))))
+        quick-ppss))))
 
 ;; Balancing means controlling pairing and skipping of parentheses
 ;; so that, if possible, the buffer ends up at least as balanced as
diff --git a/lisp/frame.el b/lisp/frame.el
index 7b0a0a80082..f081df788ec 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1722,14 +1722,14 @@ left untouched.  FRAME nil or omitted means use the selected frame."
   :group 'cursor)
 
 (defcustom blink-cursor-blinks 10
-  "How many times to blink before using a solid cursor on NS and X.
+  "How many times to blink before using a solid cursor on NS, X, and MS-Windows.
 Use 0 or negative value to blink forever."
   :version "24.4"
   :type 'integer
   :group 'cursor)
 
 (defvar blink-cursor-blinks-done 1
-  "Number of blinks done since we started blinking on NS and X")
+  "Number of blinks done since we started blinking on NS, X, and MS-Windows.")
 
 (defvar blink-cursor-idle-timer nil
   "Timer started after `blink-cursor-delay' seconds of Emacs idle time.
@@ -1807,6 +1807,12 @@ With a prefix argument ARG, enable Blink Cursor mode if ARG is
 positive, and disable it otherwise.  If called from Lisp, enable
 the mode if ARG is omitted or nil.
 
+If the value of `blink-cursor-blinks' is positive (10 by default),
+the cursor stops blinking after that number of blinks, if Emacs
+gets no input during that time.
+
+See also `blink-cursor-interval' and `blink-cursor-delay'.
+
 This command is effective only on graphical frames.  On text-only
 terminals, cursor blinking is controlled by the terminal."
   :init-value (not (or noninteractive
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 1282654899f..56887f39bef 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -1328,9 +1328,7 @@ return a `defface' style list of face properties instead of a face symbol."
 (defun hfy-overlay-props-at (p)
   "Grab overlay properties at point P.
 The plists are returned in descending priority order."
-  (sort (mapcar #'overlay-properties (overlays-at p))
-        (lambda (A B) (> (or (cadr (memq 'priority A)) 0) ;FIXME: plist-get?
-                    (or (cadr (memq 'priority B)) 0)))))
+ (mapcar #'overlay-properties (overlays-at p 'sorted)))
 
 ;; construct an assoc of (face-name . (css-name . "{ css-style }")) elements:
 (defun hfy-compile-stylesheet ()
@@ -1642,7 +1640,6 @@ FILE, if set, is the file name."
           (css-map                     nil)
           (invis-ranges                nil)
           (rovl                        nil)
-          (orig-ovls      (overlays-in (point-min) (point-max)))
           (rmin           (when mark-active (region-beginning)))
           (rmax           (when mark-active (region-end      ))) )
     (when (and mark-active
@@ -1664,12 +1661,6 @@ FILE, if set, is the file name."
     (set-buffer     html-buffer)
     ;; rip out props that could interfere with our htmlization of the buffer:
     (remove-text-properties (point-min) (point-max) hfy-ignored-properties)
-    ;; Apply overlay invisible spec
-    (setq orig-ovls
-          (sort orig-ovls
-                (lambda (A B)
-                  (> (or (cadr (memq 'priority (overlay-properties A))) 0)
-                     (or (cadr (memq 'priority (overlay-properties B))) 0)))))
     ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     ;; at this point, html-buffer retains the fontification of the parent:
     ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 8b68b6f4bc7..58442575ad2 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -610,7 +610,7 @@ size, and full-buffer size."
          (concat (nth 3 base) url))
         (t
          ;; Totally relative.
-         (concat (car base) (cadr base) url))))
+         (concat (car base) (expand-file-name url (cadr base))))))
 
 (defun shr-ensure-newline ()
   (unless (zerop (current-column))
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 4d0b5ae54d4..3b600e3d84e 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -950,15 +950,15 @@ target of the symlink differ."
           (tramp-message v 4 "Finding true name for `%s'" filename)
           (cond
            ;; Use GNU readlink --canonicalize-missing where available.
-           ;; We must quote the file name twice due to the backticks.
            ((tramp-get-remote-readlink v)
-            (setq result
-                  (tramp-send-command-and-read
-                   v
-                   (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\""
-                           (tramp-get-remote-readlink v)
-                           (tramp-shell-quote-argument
-                            (tramp-shell-quote-argument localname))))))
+            (tramp-send-command-and-check
+             v
+             (format "%s --canonicalize-missing %s"
+                     (tramp-get-remote-readlink v)
+                     (tramp-shell-quote-argument localname)))
+            (with-current-buffer (tramp-get-connection-buffer v)
+              (goto-char (point-min))
+              (setq result (buffer-substring (point-min) (point-at-eol)))))
 
            ;; Use Perl implementation.
            ((and (tramp-get-remote-perl v)
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 0daf62d804f..cd50bce2152 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -872,7 +872,7 @@ Called with `font-lock-beg' and `font-lock-end' dynamically bound."
 
 (defun nxml-fontify-matcher (bound)
   "Called as font-lock keyword matcher."
-
+  (syntax-propertize bound)
   (unless nxml-degraded
     (nxml-debug-change "nxml-fontify-matcher" (point) bound)
 
diff --git a/lisp/nxml/xmltok.el b/lisp/nxml/xmltok.el
index 58a2f16d586..f80a5fd2fa1 100644
--- a/lisp/nxml/xmltok.el
+++ b/lisp/nxml/xmltok.el
@@ -750,7 +750,8 @@ Return the type of the token."
                  ;; Need do this after the goto-char because
                  ;; marked error should just apply to <!--
                  (xmltok-add-error "First following `--' not followed by `>'")
-                 'not-well-formed)))))
+                 (goto-char (point-max))
+                 'comment)))))
 
 (defun xmltok-scan-attributes ()
   (let ((recovering nil)
diff --git a/lisp/obsolete/lucid.el b/lisp/obsolete/lucid.el
index d3cb3f135d8..15f80652809 100644
--- a/lisp/obsolete/lucid.el
+++ b/lisp/obsolete/lucid.el
@@ -125,7 +125,7 @@ This is an XEmacs compatibility function."
 
 (defun extent-at (pos &optional object property before)
   (with-current-buffer (or object (current-buffer))
-    (let ((overlays (overlays-at pos)))
+    (let ((overlays (overlays-at pos 'sorted)))
       (when property
         (let (filtered)
           (while overlays
@@ -133,14 +133,6 @@ This is an XEmacs compatibility function."
                 (setq filtered (cons (car overlays) filtered)))
             (setq overlays (cdr overlays)))
           (setq overlays filtered)))
-      (setq overlays
-            (sort overlays
-                  (function (lambda (o1 o2)
-                              (let ((p1 (or (overlay-get o1 'priority) 0))
-                                    (p2 (or (overlay-get o2 'priority) 0)))
-                                (or (> p1 p2)
-                                    (and (= p1 p2)
-                                         (> (overlay-start o1) (overlay-start o2)))))))))
       (if before
           (nth 1 (memq before overlays))
         (car overlays)))))
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 3486c0a1983..f89fec7b1e0 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -903,7 +903,9 @@ Optional argument PARSE-START should be the position of `beginning-of-defun'."
         ;;          following_quotep minimum_paren-depth_this_scan)
         ;; Parsing stops if depth in parentheses becomes equal to third arg.
         (setq containing-sexp (nth 1 state)))
-      (cond ((nth 3 state) 'noindent)   ; In a quoted string?
+      (cond
+       ;; Don't auto-indent in a quoted string or a here-document.
+       ((or (nth 3 state) (eq 2 (nth 7 state))) 'noindent)
             ((null containing-sexp)     ; Line is at top level.
              (skip-chars-forward " \t\f")
              (if (memq (following-char)
diff --git a/lisp/ps-def.el b/lisp/ps-def.el
index 06cef75cbbd..92a2e0b38cd 100644
--- a/lisp/ps-def.el
+++ b/lisp/ps-def.el
@@ -339,53 +339,11 @@
         (setq position (min property-change overlay-change)
               before-string nil
               after-string nil)
-        ;; The code below is not quite correct,
-        ;; because a non-nil overlay invisible property
-        ;; which is inactive according to the current value
-        ;; of buffer-invisibility-spec nonetheless overrides
-        ;; a face text property.
         (setq face
-              (cond ((let ((prop (get-text-property from 'invisible)))
-                       ;; Decide whether this invisible property
-                       ;; really makes the text invisible.
-                       (if (eq save-buffer-invisibility-spec t)
-                           (not (null prop))
-                         (or (memq prop save-buffer-invisibility-spec)
-                             (assq prop save-buffer-invisibility-spec))))
+              (cond ((invisible-p from)
                      'emacs--invisible--face)
-                    ((get-text-property from 'face))
+                    ((get-char-property from 'face))
                     (t 'default)))
-        (let ((overlays (overlays-at from))
-              (face-priority -1))       ; text-property
-          (while (and overlays
-                      (not (eq face 'emacs--invisible--face)))
-            (let* ((overlay (car overlays))
-                   (overlay-invisible
-                    (overlay-get overlay 'invisible))
-                   (overlay-priority
-                    (or (overlay-get overlay 'priority) 0)))
-              (and (> overlay-priority face-priority)
-                   (setq before-string
-                         (or (overlay-get overlay 'before-string)
-                             before-string)
-                         after-string
-                         (or (and (<= (overlay-end overlay) position)
-                                  (overlay-get overlay 'after-string))
-                             after-string)
-                         face-priority overlay-priority
-                         face
-                         (cond
-                          ((if (eq save-buffer-invisibility-spec t)
-                               (not (null overlay-invisible))
-                             (or (memq overlay-invisible
-                                       save-buffer-invisibility-spec)
-                                 (assq overlay-invisible
-                                       save-buffer-invisibility-spec)))
-                           'emacs--invisible--face)
-                          ((overlay-get overlay 'face))
-                          (t face)
-                          ))))
-            (setq overlays (cdr overlays))))
         ;; Plot up to this record.
         (and before-string
              (ps-plot-string before-string))
diff --git a/lisp/simple.el b/lisp/simple.el
index 0af15269bb9..17aba8e6a40 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2143,7 +2143,12 @@ as an argument limits undo to changes within the current region."
       ;; above when checking.
       (while (eq (car list) nil)
         (setq list (cdr list)))
-      (puthash list (if undo-in-region t pending-undo-list)
+      (puthash list
+               ;; Prevent identity mapping.  This can happen if
+               ;; consecutive nils are erroneously in undo list.
+               (if (or undo-in-region (eq list pending-undo-list))
+                   t
+                 pending-undo-list)
                undo-equiv-table))
     ;; Don't specify a position in the undo record for the undo command.
     ;; Instead, undoing this should move point to where the change is.
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 00b860f8dcc..f24a54fbe28 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -165,6 +165,27 @@ created."
 
 ;; From src/xfns.c
 (defun x-list-fonts (_pattern &optional _face _frame _maximum width)
+  "Return a list of the names of available fonts matching PATTERN.
+If optional arguments FACE and FRAME are specified, return only fonts
+the same size as FACE on FRAME.
+
+PATTERN should be a string containing a font name in the XLFD,
+Fontconfig, or GTK format.  A font name given in the XLFD format may
+contain wildcard characters:
+  the * character matches any substring, and
+  the ? character matches any single character.
+  PATTERN is case-insensitive.
+
+The return value is a list of strings, suitable as arguments to
+\`set-face-font'.
+
+Fonts Emacs can't use may or may not be excluded
+even if they match PATTERN and FACE.
+The optional fourth argument MAXIMUM sets a limit on how many
+fonts to match.  The first MAXIMUM fonts are reported.
+The optional fifth argument WIDTH, if specified, is a number of columns
+occupied by a character of a font.  In that case, return only fonts
+the WIDTH times as wide as FACE on FRAME."
   (if (or (null width) (and (numberp width) (= width 1)))
       (list "ms-dos")
     (list "no-such-font")))
@@ -232,9 +253,9 @@ is not used)."
       (w16-set-clipboard-data text))
   (setq x-last-selected-text text))
 
-;;; Return the value of the current selection.
-;;; Consult the selection.  Treat empty strings as if they were unset.
 (defun x-get-selection-value ()
+  "Return the value of the current selection.
+Consult the selection.  Treat empty strings as if they were unset."
   (if x-select-enable-clipboard
       (let (text)
         ;; Don't die if x-get-selection signals an error.
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index f429eb35d70..ed248fbf835 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -822,8 +822,9 @@ one optional arguments, diff-number to refine.")
                 (ediff-get-symbol-from-alist
                  buf-type ediff-fine-diff-face-alist)
                 )))
-    (dolist (overl fine-diff-vector)
-      (ediff-set-overlay-face overl face))))
+    (mapc (lambda (overl)
+            (ediff-set-overlay-face overl face))
+          fine-diff-vector)))
 
 ;; Set overlays over the regions that denote delimiters
 (defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num)