merge master

11 files changed, 114 insertions, 38 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d5416c5cea..aa79a8d4b2e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,51 @@
+2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Less 'make' chatter for lisp dir
+        * Makefile.in (THEFILE): Define to be 'no-such-file' by default,
+        to make it clearer that the caller must specify it.
+        (compile-onefile): Remove, replacing by ...
+        ($(THEFILE)c): ... new rule.  This lets us use AM_V_GEN here.
+        ($(THEFILE)c, .el.elc, $(MH_E_DIR)/mh-loaddefs.el)
+        ($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el)
+        ($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el):
+        Use AM_V_GEN to lessen 'make' chatter.
+        (.el.elc): Omit duplicate comment.
+
+        Less 'make' chatter in batch mode
+        * emacs-lisp/autoload.el (autoload-generate-file-autoloads):
+        * emacs-lisp/bytecomp.el (byte-compile-file):
+        * files.el (save-buffer, basic-save-buffer):
+        * international/quail.el (quail-update-leim-list-file):
+        Don't output messages like "Generating ..." in batch mode.
+
+2015-01-04  Dmitry Gutov  <dgutov@yandex.ru>
+
+        Unbreak `mouse-action' property in text buttons.
+
+        * button.el (push-button): Fix regression from 2012-12-06.
+
+2015-01-03  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/xref.el (xref-marker-stack-empty-p): New function.
+
+        * menu-bar.el (menu-bar-goto-menu): Use it.
+
+2015-01-03  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/xref.el (xref--window-configuration): New variable.
+        (xref-show-location-at-point): New command.
+        (xref--restore-window-configuration): New function.
+        (xref-next-line, xref-prev-line): Delegate to
+        `xref-show-location-at-point'.
+        (xref--location-at-point): Don't signal the error.
+        (xref-goto-xref): Do that here instead.
+        (xref--xref-buffer-mode): Add `xref--restore-window-configuration'
+        to `pre-command-hook'.
+        (xref--xref-buffer-mode-map): Don't remap `next-line' and
+        `previous-line'.  Additionally bind `xref-next-line' and
+        `xref-prev-line' to `n' and `p' respectively.  Bind
+        `xref-show-location-at-point' to `C-o'.
+
 2015-01-01  Eli Zaretskii  <eliz@gnu.org>
 
         * tool-bar.el (tool-bar-local-item)
@@ -59,6 +107,12 @@
 
         * obsolete/pc-select.el (pc-selection-mode): Use system-type.
         This is instead of system-name, which is both wrong here and obsolete.
+        * desktop.el (desktop-save-frameset):
+        * dnd.el (dnd-get-local-file-uri):
+        * nxml/rng-uri.el (rng-uri-file-name-1):
+        Prefer (system-name) to system-name, and avoid naming
+        locals 'system-name'.
+        * startup.el (system-name): Now an obsolete variable.  (Bug#19438)
 
 2014-12-29  Dmitry Gutov  <dgutov@yandex.ru>
 
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 67855baf9f3..565ca77de3b 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -257,12 +257,10 @@ TAGS: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4)
 # src/Makefile.in to rebuild a particular Lisp file, no questions asked.
 # Use byte-compile-refresh-preloaded to try and work around some of
 # the most common problems of not bootstrapping from a clean state.
-.PHONY: compile-onefile
-compile-onefile:
-        @echo Compiling $(THEFILE)
-        @# Use byte-compile-refresh-preloaded to try and work around some of
-        @# the most common bootstrapping problems.
-        @$(emacs) $(BYTE_COMPILE_FLAGS) \
+THEFILE = no-such-file
+.PHONY: $(THEFILE)c
+$(THEFILE)c:
+        $(AM_V_GEN)$(emacs) $(BYTE_COMPILE_FLAGS) \
                 -l bytecomp -f byte-compile-refresh-preloaded \
                 -f batch-byte-compile $(THEFILE)
 
@@ -278,12 +276,7 @@ compile-onefile:
 # An old-fashioned suffix rule, which, according to the GNU Make manual,
 # cannot have prerequisites.
 .el.elc:
-        @echo Compiling $<
-        @# The BIG_STACK_OPTS are only needed to byte-compile the byte-compiler
-        @# files, which is normally done in compile-first, but may also be
-        @# recompiled via this rule.
-        @$(emacs) $(BYTE_COMPILE_FLAGS) \
-                -f batch-byte-compile $<
+        $(AM_V_GEN)$(emacs) $(BYTE_COMPILE_FLAGS) -f batch-byte-compile $<
 
 .PHONY: compile-first compile-main compile compile-always
 
@@ -404,7 +397,7 @@ MH_E_SRC = $(MH_E_DIR)/mh-acros.el $(MH_E_DIR)/mh-alias.el    \
 .PHONY: mh-autoloads
 mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el
 $(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC)
-        $(emacs) -l autoload \
+        $(AM_V_GEN)$(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
            --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
            -f batch-update-autoloads $(MH_E_DIR)
@@ -421,7 +414,7 @@ TRAMP_SRC = $(TRAMP_DIR)/tramp.el    $(TRAMP_DIR)/tramp-adb.el	\
         $(TRAMP_DIR)/tramp-uu.el     $(TRAMP_DIR)/trampver.el
 
 $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC)
-        $(emacs) -l autoload \
+        $(AM_V_GEN)$(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \
            --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
            -f batch-update-autoloads $(TRAMP_DIR)
@@ -442,19 +435,19 @@ CAL_SRC = $(CAL_DIR)/cal-bahai.el $(CAL_DIR)/cal-china.el  \
         $(CAL_DIR)/solar.el
 
 $(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC)
-        $(emacs) -l autoload \
+        $(AM_V_GEN)$(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \
            --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
            -f batch-update-autoloads $(CAL_DIR)
 
 $(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/cal-loaddefs.el
-        $(emacs) -l autoload \
+        $(AM_V_GEN)$(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \
            --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
            -f batch-update-autoloads $(CAL_DIR)
 
 $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/diary-loaddefs.el
-        $(emacs) -l autoload \
+        $(AM_V_GEN)$(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \
            --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
            -f batch-update-autoloads $(CAL_DIR)
diff --git a/lisp/button.el b/lisp/button.el
index 2836b89020a..189a1c23a4d 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -449,7 +449,7 @@ return t."
           (if (posn-string posn)
               ;; mode-line, header-line, or display string event.
               (button-activate (posn-string posn) t)
-            (push-button (posn-point posn)) t)))
+            (push-button (posn-point posn) t))))
     ;; POS is just normal position
     (let ((button (button-at (or pos (point)))))
       (when button
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index e9d13b86c29..073d923a178 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -539,7 +539,7 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE
                                (autoload-find-file file))
         ;; Obey the no-update-autoloads file local variable.
         (unless no-update-autoloads
-          (message "Generating autoloads for %s..." file)
+          (or noninteractive (message "Generating autoloads for %s..." file))
           (setq load-name
                 (if (stringp generated-autoload-load-name)
                     generated-autoload-load-name
@@ -623,7 +623,8 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE
                        (nth 5 (file-attributes relfile))))
                     (insert ";;; Generated autoloads from " relfile "\n")))
                 (insert generate-autoload-section-trailer))))
-          (message "Generating autoloads for %s...done" file))
+          (or noninteractive
+              (message "Generating autoloads for %s...done" file)))
         (or visited
             ;; We created this buffer, so we should kill it.
             (kill-buffer (current-buffer))))
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 4c694adfa23..1acd4fe76b2 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1858,7 +1858,7 @@ The value is non-nil if there were no errors, nil if errors."
                 ;; recompiled).  Previously this was accomplished by
                 ;; deleting target-file before writing it.
                 (rename-file tempfile target-file t)
-                (message "Wrote %s" target-file))
+                (or noninteractive (message "Wrote %s" target-file)))
             ;; This is just to give a better error message than write-region
             (signal 'file-error
                     (list "Opening output file"
diff --git a/lisp/files.el b/lisp/files.el
index 22362ca13ca..80b538c3267 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4663,7 +4663,7 @@ See the subroutine `basic-save-buffer' for more information."
     ;; then Rmail-mbox never displays it due to buffer swapping.  If
     ;; the test is ever re-introduced, be sure to handle saving of
     ;; Rmail files.
-    (if (and modp (buffer-file-name))
+    (if (and modp (buffer-file-name) (not noninteractive))
         (message "Saving file %s..." (buffer-file-name)))
     (basic-save-buffer)
     (and modp (memq arg '(4 64)) (setq buffer-backed-up nil))))
@@ -4805,7 +4805,7 @@ Before and after saving the buffer, this function runs
           ;; Support VC `implicit' locking.
           (vc-after-save)
           (run-hooks 'after-save-hook))
-      (message "(No changes need to be saved)"))))
+      (or noninteractive (message "(No changes need to be saved)")))))
 
 ;; This does the "real job" of writing a buffer into its visited file
 ;; and making a backup file.  This is what is normally done
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 73fe41f01f2..73a0de76a1f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * message.el (message-make-fqdn):
+        * nnvirtual.el (nnvirtual-retrieve-headers)
+        (nnvirtual-update-xref-header): Prefer (system-name) to system-name,
+        and avoid naming locals 'system-name'.
+
 2014-12-29  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * mm-decode.el (mm-shr): Bind `shr-width' to `fill-column' so that
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index f194b93526e..2755fd68bef 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -2985,7 +2985,7 @@ of each directory."
         quail-dirs list-buf pkg-list pos)
     (if (not (file-writable-p leim-list))
         (error "Can't write to file \"%s\"" leim-list))
-    (message "Updating %s ..." leim-list)
+    (or noninteractive (message "Updating %s ..." leim-list))
     (setq list-buf (find-file-noselect leim-list))
 
     ;; At first, clean up the file.
@@ -3077,7 +3077,7 @@ of each directory."
       (let ((coding-system-for-write 'utf-8))
         (save-buffer 0)))
     (kill-buffer list-buf)
-    (message "Updating %s ... done" leim-list)))
+    (or noninteractive (message "Updating %s ... done" leim-list))))
 
 (defun quail-advice (args)
   "Advise users about the characters input by the current Quail package.
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 7d7e4660fb5..67cb3273d23 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -381,6 +381,7 @@
 
     (bindings--define-key menu [xref-pop]
       '(menu-item "Back" xref-pop-marker-stack
+                  :visible (not (xref-marker-stack-empty-p))
                   :help "Back to the position of the last search"))
 
     (bindings--define-key menu [xref-apropos]
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 7b87933935c..081da5db73b 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * org-clock.el (org-clock-save): Prefer (system-name) to system-name.
+
 2014-10-29  Paul Eggert  <eggert@cs.ucla.edu>
 
         Simplify use of current-time and friends.
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index a5ff5ee55ad..7bc6500a8de 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -301,6 +301,10 @@ backward."
       (let ((marker (ring-remove ring)))
         (set-marker marker nil nil)))))
 
+(defun xref-marker-stack-empty-p ()
+  "Return t if the marker stack is empty; nil otherwise."
+  (ring-empty-p xref--marker-ring))
+
 
 (defun xref--goto-location (location)
   "Set buffer and point according to xref-location LOCATION."
@@ -328,6 +332,8 @@ WINDOW controls how the buffer is displayed:
 
 ;; The xref buffer is used to display a set of xrefs.
 
+(defvar-local xref--window-configuration nil)
+
 (defun xref--display-position (pos other-window recenter-arg)
   ;; show the location, but don't hijack focus.
   (with-selected-window (display-buffer (current-buffer) other-window)
@@ -341,46 +347,56 @@ WINDOW controls how the buffer is displayed:
         (xref--display-position (point) t 1))
     (user-error (message (error-message-string err)))))
 
-(defun xref--next-line (backward)
-  (let ((loc (xref--search-property 'xref-location backward)))
+(defun xref-show-location-at-point ()
+  "Display the source of xref at point in the other window, if any."
+  (interactive)
+  (let ((loc (xref--location-at-point)))
     (when loc
-      (save-window-excursion
-        (xref--show-location loc)
-        (sit-for most-positive-fixnum)))))
+      (setq xref--window-configuration (current-window-configuration))
+      (xref--show-location loc))))
+
+(defun xref--restore-window-configuration ()
+  (when xref--window-configuration
+    (set-window-configuration xref--window-configuration)
+    (setq xref--window-configuration nil)))
 
 (defun xref-next-line ()
   "Move to the next xref and display its source in the other window."
   (interactive)
-  (xref--next-line nil))
+  (xref--search-property 'xref-location)
+  (xref-show-location-at-point))
 
 (defun xref-prev-line ()
   "Move to the previous xref and display its source in the other window."
   (interactive)
-  (xref--next-line t))
+  (xref--search-property 'xref-location t)
+  (xref-show-location-at-point))
 
 (defun xref--location-at-point ()
-  (or (get-text-property (point) 'xref-location)
-      (error "No reference at point")))
+  (get-text-property (point) 'xref-location))
 
 (defvar-local xref--window nil)
 
 (defun xref-goto-xref ()
   "Jump to the xref at point and bury the xref buffer."
   (interactive)
-  (let ((loc (xref--location-at-point))
+  (let ((loc (or (xref--location-at-point)
+                 (error "No reference at point")))
         (window xref--window))
     (quit-window)
     (xref--pop-to-location loc window)))
 
 (define-derived-mode xref--xref-buffer-mode fundamental-mode "XREF"
   "Mode for displaying cross-references."
-  (setq buffer-read-only t))
+  (setq buffer-read-only t)
+  (add-hook 'pre-command-hook #'xref--restore-window-configuration nil t))
 
 (let ((map xref--xref-buffer-mode-map))
   (define-key map (kbd "q") #'quit-window)
-  (define-key map [remap next-line] #'xref-next-line)
-  (define-key map [remap previous-line] #'xref-prev-line)
+  (define-key map (kbd "n") #'xref-next-line)
+  (define-key map (kbd "p") #'xref-prev-line)
   (define-key map (kbd "RET") #'xref-goto-xref)
+  (define-key map (kbd "C-o") #'xref-show-location-at-point)
 
   ;; suggested by Johan Claesson "to further reduce finger movement":
   (define-key map (kbd ".") #'xref-next-line)