merge master

13 files changed, 108 insertions, 50 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7aa66bf9ad5..5cceb19ff1a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,41 @@
+2015-01-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Don't downcase system diagnostics' first letters
+        * emacs-lisp/bytecomp.el (byte-compile-file):
+        * ffap.el (find-file-at-point):
+        * files.el (insert-file-1):
+        * net/ange-ftp.el (ange-ftp-barf-if-not-directory)
+        (ange-ftp-copy-file-internal):
+        * progmodes/etags.el (visit-tags-table):
+        Keep diagnostics consistent with system's.
+        * ffap.el (ffap-machine-p):
+        Ignore case while comparing diagnostics.
+
+2015-01-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * help.el (help-make-usage): Don't turn a "_" arg into an empty-string
+        arg (bug#19645).
+        * emacs-lisp/cl-generic.el (cl--generic-lambda): Don't confuse a string
+        body with a docstring.
+
+2015-01-22  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/xref.el (xref-location-marker, xref-location-group):
+        Use `cl-defgeneric' and `cl-defmethod' instead of the EIEIO
+        counterparts.
+
+        * progmodes/etags.el (xref-location-marker): Same.
+
+        * progmodes/xref.el (xref--current): Rename from `xref--selected'.
+        (xref--inhibit-mark-current): Rename from
+        `xref--inhibit-mark-selected'.  Update the usages.
+        (xref-quit): Reword the docstring.  Kill buffers after quitting
+        windows instead of before.
+        (xref--insert-xrefs): Tweak help-echo.
+        (xref--read-identifier-history, xref--read-pattern-history):
+        New variables.
+        (xref--read-identifier, xref-find-apropos): Use them.
+
 2015-01-21  Ulrich Müller  <ulm@gentoo.org>
 
         * play/gamegrid.el (gamegrid-add-score-with-update-game-score):
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 8440570d755..2bd8d07851b 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1863,8 +1863,8 @@ The value is non-nil if there were no errors, nil if errors."
             (signal 'file-error
                     (list "Opening output file"
                           (if (file-exists-p target-file)
-                              "cannot overwrite file"
-                            "directory not writable or nonexistent")
+                              "Cannot overwrite file"
+                            "Directory not writable or nonexistent")
                           target-file)))
           (kill-buffer (current-buffer)))
         (if (and byte-compile-generate-call-tree
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index 8dee9a38ab0..f214faff237 100644
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -228,7 +228,8 @@ This macro can only be used within the lexical scope of a cl-generic method."
     "Make the lambda expression for a method with ARGS and BODY."
     (let ((plain-args ())
           (specializers nil)
-          (doc-string (if (stringp (car-safe body)) (pop body)))
+          (doc-string (if (and (stringp (car-safe body)) (cdr body))
+                          (pop body)))
           (mandatory t))
       (dolist (arg args)
         (push (pcase arg
@@ -252,7 +253,7 @@ This macro can only be used within the lexical scope of a cl-generic method."
           ;; destructuring args, `declare' and whatnot).
           (pcase (macroexpand fun macroenv)
             (`#'(lambda ,args . ,body)
-             (let* ((doc-string (and doc-string (stringp (car body))
+             (let* ((doc-string (and doc-string (stringp (car body)) (cdr body)
                                      (pop body)))
                     (cnm (make-symbol "cl--cnm"))
                     (nmp (make-symbol "cl--nmp"))
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 1b54fb6a48d..28ac7d38b96 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Don't downcase system diagnostics' first letters
+        * erc-dcc.el (erc-dcc-server): Ignore case while comparing diagnostics.
+
 2014-11-23  Michael Albinus  <michael.albinus@gmx.de>
 
         * erc-desktop-notifications.el (erc-notifications-bus):
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 9d52c3b7c09..182f1e05921 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -379,7 +379,7 @@ created subprocess, or nil."
                   (set-process-filter-multibyte process nil)))))
         (file-error
          (unless (and (string= "Cannot bind server socket" (nth 1 err))
-                      (string= "address already in use" (nth 2 err)))
+                      (string= "address already in use" (downcase (nth 2 err))))
            (signal (car err) (cdr err)))
          (setq port (1+ port))
          (unless (< port upper)
@@ -1264,4 +1264,3 @@ other client."
 ;; Local Variables:
 ;; indent-tabs-mode: nil
 ;; End:
-
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 1b8ea60e03b..350a6bdac20 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -476,7 +476,7 @@ Returned values:
               ;; (file-error "connection failed" "address already in use"
               ;;             "ftp.uu.net" "ffap-machine-p")
               ((equal mesg "connection failed")
-               (if (equal (nth 2 error) "permission denied")
+               (if (string= (downcase (nth 2 error)) "permission denied")
                    nil                  ; host does not exist
                  ;; Other errors mean the host exists:
                  (nth 2 error)))
@@ -1439,7 +1439,7 @@ and the functions `ffap-file-at-point' and `ffap-url-at-point'."
                  (expand-file-name filename)))
        ;; User does not want to find a non-existent file:
        ((signal 'file-error (list "Opening file buffer"
-                                  "no such file or directory"
+                                  "No such file or directory"
                                   filename)))))))
 
 ;; Shortcut: allow {M-x ffap} rather than {M-x find-file-at-point}.
diff --git a/lisp/files.el b/lisp/files.el
index e9632edacef..ed1943dfc28 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2128,7 +2128,7 @@ This function ensures that none of these modifications will take place."
 
 (defun insert-file-1 (filename insert-func)
   (if (file-directory-p filename)
-      (signal 'file-error (list "Opening input file" "file is a directory"
+      (signal 'file-error (list "Opening input file" "Is a directory"
                                 filename)))
   ;; Check whether the file is uncommonly large
   (abort-if-file-too-large (nth 7 (file-attributes filename)) "insert" filename)
diff --git a/lisp/help.el b/lisp/help.el
index 39ec6be1fde..bf724252d5a 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1445,7 +1445,7 @@ the same names as used in the original source code, when possible."
                     (let ((name (symbol-name arg)))
                       (cond
                        ((string-match "\\`&" name) arg)
-                       ((string-match "\\`_" name)
+                       ((string-match "\\`_." name)
                         (intern (upcase (substring name 1))))
                        (t (intern (upcase name)))))))
                 arglist)))
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 17db6e76ec9..52153ad8322 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1536,8 +1536,8 @@ then kill the related FTP process."
       (signal 'file-error
               (list "Opening directory"
                     (if (file-exists-p directory)
-                        "not a directory"
-                      "no such file or directory")
+                        "Not a directory"
+                      "No such file or directory")
                     directory))))
 
 ;;;; ------------------------------------------------------------
@@ -3664,7 +3664,7 @@ so return the size on the remote host exactly. See RFC 3659."
 
   (or (file-exists-p filename)
       (signal 'file-error
-              (list "Copy file" "no such file or directory" filename)))
+              (list "Copy file" "No such file or directory" filename)))
 
   ;; canonicalize newname if a directory.
   (if (file-directory-p newname)
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index dc3380d02f6..b470352f8dc 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -308,7 +308,7 @@ file the tag was in."
     (save-excursion
       (or (visit-tags-table-buffer file)
           (signal 'file-error (list "Visiting tags table"
-                                    "file does not exist"
+                                    "No such file or directory"
                                     file)))
       ;; Set FILE to the expanded name.
       (setq file tags-file-name)))
@@ -2122,7 +2122,7 @@ for \\[find-tag] (which see)."
   (make-instance 'xref-etags-location :tag-info tag-info
                  :file (expand-file-name file)))
 
-(defmethod xref-location-marker ((l xref-etags-location))
+(cl-defmethod xref-location-marker ((l xref-etags-location))
   (with-slots (tag-info file) l
     (let ((buffer (find-file-noselect file)))
       (with-current-buffer buffer
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index ee8125073aa..55405b63fe0 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -66,10 +66,10 @@
 
 ;; If a backend decides to subclass xref-location it can provide
 ;; methods for some of the following functions:
-(defgeneric xref-location-marker (location)
+(cl-defgeneric xref-location-marker (location)
   "Return the marker for LOCATION.")
 
-(defgeneric xref-location-group (location)
+(cl-defgeneric xref-location-group (location)
   "Return a string used to group a set of locations.
 This is typically the filename.")
 
@@ -88,7 +88,7 @@ Line numbers start from 1 and columns from 0.")
   "Create and return a new xref-file-location."
   (make-instance 'xref-file-location :file file :line line :column column))
 
-(defmethod xref-location-marker ((l xref-file-location))
+(cl-defmethod xref-location-marker ((l xref-file-location))
   (with-slots (file line column) l
     (with-current-buffer
         (or (get-file-buffer file)
@@ -102,7 +102,7 @@ Line numbers start from 1 and columns from 0.")
           (move-to-column column)
           (point-marker))))))
 
-(defmethod xref-location-group ((l xref-file-location))
+(cl-defmethod xref-location-group ((l xref-file-location))
   (oref l :file))
 
 (defclass xref-buffer-location (xref-location)
@@ -113,12 +113,12 @@ Line numbers start from 1 and columns from 0.")
   "Create and return a new xref-buffer-location."
   (make-instance 'xref-buffer-location :buffer buffer :position position))
 
-(defmethod xref-location-marker ((l xref-buffer-location))
+(cl-defmethod xref-location-marker ((l xref-buffer-location))
   (with-slots (buffer position) l
     (let ((m (make-marker)))
       (move-marker m position buffer))))
 
-(defmethod xref-location-group ((l xref-buffer-location))
+(cl-defmethod xref-location-group ((l xref-buffer-location))
   (with-slots (buffer) l
     (or (buffer-file-name buffer)
         (format "(buffer %s)" (buffer-name buffer)))))
@@ -134,10 +134,10 @@ actual location is not known.")
   "Create and return a new xref-bogus-location."
   (make-instance 'xref-bogus-location :message message))
 
-(defmethod xref-location-marker ((l xref-bogus-location))
+(cl-defmethod xref-location-marker ((l xref-bogus-location))
   (user-error "%s" (oref l :message)))
 
-(defmethod xref-location-group ((_ xref-bogus-location)) "(No location)")
+(cl-defmethod xref-location-group ((_ xref-bogus-location)) "(No location)")
 
 ;; This should be in elisp-mode.el, but it's preloaded, and we can't
 ;; preload defclass and defmethod (at least, not yet).
@@ -151,7 +151,7 @@ actual location is not known.")
 (defun xref-make-elisp-location (symbol type file)
   (make-instance 'xref-elisp-location :symbol symbol :type type :file file))
 
-(defmethod xref-location-marker ((l xref-elisp-location))
+(cl-defmethod xref-location-marker ((l xref-elisp-location))
   (with-slots (symbol type file) l
     (let ((buffer-point
            (pcase type
@@ -342,15 +342,15 @@ WINDOW controls how the buffer is displayed:
 (defvar-local xref--temporary-buffers nil
   "List of buffers created by xref code.")
 
-(defvar-local xref--selected nil
-  "t if the current buffer has ever been selected.
+(defvar-local xref--current nil
+  "Non-nil if this buffer was once current, except while displaying xrefs.
 Used for temporary buffers.")
 
-(defvar xref--inhibit-mark-selected nil)
+(defvar xref--inhibit-mark-current nil)
 
 (defun xref--mark-selected ()
-  (unless xref--inhibit-mark-selected
-    (setq xref--selected t))
+  (unless xref--inhibit-mark-current
+    (setq xref--current t))
   (remove-hook 'buffer-list-update-hook #'xref--mark-selected t))
 
 (defun xref--save-to-history (buf win)
@@ -375,7 +375,7 @@ Used for temporary buffers.")
   (condition-case err
       (let ((xref-buf (current-buffer))
             (bl (buffer-list))
-            (xref--inhibit-mark-selected t))
+            (xref--inhibit-mark-current t))
         (xref--goto-location location)
         (let ((buf (current-buffer)))
           (unless (memq buf bl)
@@ -438,29 +438,28 @@ Used for temporary buffers.")
   (setq buffer-read-only t))
 
 (defun xref-quit (&optional kill)
-  "Perform cleanup, then quit the current window.
-The cleanup consists of burying all temporarily displayed
-buffers, and if KILL is non-nil, of killing all buffers that were
-created in the process of showing xrefs.
-
-Exceptions are made for buffers switched to by the user in the
-meantime, and other window configuration changes.  These are
-preserved."
+  "Bury temporarily displayed buffers, then quit the current window.
+
+If KILL is non-nil, kill all buffers that were created in the
+process of showing xrefs, and also kill the current buffer.
+
+The buffers that the user has otherwise interacted with in the
+meantime are preserved."
   (interactive "P")
   (let ((window (selected-window))
         (history xref--display-history))
     (setq xref--display-history nil)
+    (pcase-dolist (`(,buf . ,win) history)
+      (when (and (window-live-p win)
+                 (eq buf (window-buffer win)))
+        (quit-window nil win)))
     (when kill
-      (let ((xref--inhibit-mark-selected t)
+      (let ((xref--inhibit-mark-current t)
             kill-buffer-query-functions)
         (dolist (buf xref--temporary-buffers)
-          (unless (buffer-local-value 'xref--selected buf)
+          (unless (buffer-local-value 'xref--current buf)
             (kill-buffer buf)))
         (setq xref--temporary-buffers nil)))
-    (pcase-dolist (`(,buf . ,win) history)
-      (when (and (window-live-p win)
-                 (eq buf (window-buffer win)))
-        (quit-window nil win)))
     (quit-window kill window)))
 
 (defconst xref-buffer-name "*xref*"
@@ -496,7 +495,9 @@ GROUP is a string for decoration purposes and XREF is an
                              'face 'font-lock-keyword-face
                              'mouse-face 'highlight
                              'keymap xref--button-map
-                             'help-echo "mouse-2: display in another window, RET or mouse-1: navigate")
+                             'help-echo
+                             (concat "mouse-2: display in another window, "
+                                     "RET or mouse-1: follow reference"))
                        description))
                     (when (or more1 more2)
                       (insert "\n")))))
@@ -535,6 +536,10 @@ Return an alist of the form ((FILENAME . (XREF ...)) ...)."
 (defvar xref-show-xrefs-function 'xref--show-xref-buffer
   "Function to display a list of xrefs.")
 
+(defvar xref--read-identifier-history nil)
+
+(defvar xref--read-pattern-history nil)
+
 (defun xref--show-xrefs (input kind arg window)
   (let* ((bl (buffer-list))
          (xrefs (funcall xref-find-function kind arg))
@@ -557,7 +562,8 @@ Return an alist of the form ((FILENAME . (XREF ...)) ...)."
     (cond ((or current-prefix-arg (not id))
            (completing-read prompt
                             (funcall xref-identifier-completion-table-function)
-                            nil t id))
+                            nil t id
+                            'xref--read-identifier-history))
           (t id))))
 
 
@@ -593,12 +599,15 @@ With prefix argument, prompt for the identifier."
   (interactive (list (xref--read-identifier "Find references of: ")))
   (xref--show-xrefs identifier 'references identifier nil))
 
+(declare-function apropos-parse-pattern "apropos" (pattern))
+
 ;;;###autoload
 (defun xref-find-apropos (pattern)
   "Find all meaningful symbols that match PATTERN.
 The argument has the same meaning as in `apropos'."
   (interactive (list (read-from-minibuffer
-                      "Search for pattern (word list or regexp): ")))
+                      "Search for pattern (word list or regexp): "
+                      nil nil nil 'xref--read-pattern-history)))
   (require 'apropos)
   (xref--show-xrefs pattern 'apropos
                     (apropos-parse-pattern
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 1f5ece02113..920d692d319 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Don't downcase system diagnostics' first letters
+        * url-dav.el (url-dav-delete-directory, url-dav-delete-file)
+        (url-dav-directory-files): Keep diagnostics consistent with system's.
+
 2014-12-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * url-http.el (url-http-parse-headers): `gnutls-available-p' is
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index 65747e93000..61ca0885ec5 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -741,7 +741,7 @@ files in the collection as well."
                  (if (and (not recursive)
                           (/= (length props) 1))
                      (signal 'file-error (list "Removing directory"
-                                               "directory not empty" url)))))
+                                               "Directory not empty" url)))))
 
      (mapc (lambda (result)
              (setq status (plist-get (cdr result) 'DAV:status))
@@ -760,7 +760,7 @@ files in the collection as well."
                  url lock-token
                  (setq props (url-dav-get-properties url))
                  (if (eq (plist-get (cdar props) 'DAV:resourcetype) 'DAV:collection)
-                     (signal 'file-error (list "Removing old name" "is a collection" url)))))
+                     (signal 'file-error (list "Removing old name" "Is a collection" url)))))
 
     (mapc (lambda (result)
             (setq status (plist-get (cdr result) 'DAV:status))
@@ -787,7 +787,7 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
 
     (when (and (= (length properties) 1)
                (not (url-dav-file-directory-p url)))
-      (signal 'file-error (list "Opening directory" "not a directory" url)))
+      (signal 'file-error (list "Opening directory" "Not a directory" url)))
 
     (while properties
       (setq child-props (pop properties)