diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 14 | ||||
| -rw-r--r-- | lisp/bindings.el | 12 | ||||
| -rw-r--r-- | lisp/desktop.el | 11 | ||||
| -rw-r--r-- | lisp/vc/vc-dispatcher.el | 9 |
4 files changed, 38 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 91523424d5c..ac591963c0f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2014-07-16 Glenn Morris <rgm@gnu.org> + + * desktop.el (after-init-hook): Disable startup frame restoration + in non-graphical situations. (Bug#17693) + + * vc/vc-dispatcher.el (vc-log-edit): Do set up the log buffer + if it was "empty", or used for a different set of files. (Bug#17884) + +2014-07-16 Eli Zaretskii <eliz@gnu.org> + + * bindings.el (mode-line-remote): If default-directory is not a + string, don't call file-remote-p on it; instead state in the + help-echo that it is nil. (Bug#17986) + 2014-07-14 Daniel Colascione <dancol@dancol.org> * progmodes/cc-langs.el: Change comments from `cl-macroexpand-all' diff --git a/lisp/bindings.el b/lisp/bindings.el index 59aa3dfb3d3..911ab63e8d0 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -229,11 +229,13 @@ mnemonics of the following coding systems: 'help-echo (purecopy (lambda (window _object _point) (format "%s" (with-selected-window window - (concat - (if (file-remote-p default-directory) - "Current directory is remote: " - "Current directory is local: ") - default-directory))))))) + (if (stringp default-directory) + (concat + (if (file-remote-p default-directory) + "Current directory is remote: " + "Current directory is local: ") + default-directory) + "Current directory is nil"))))))) "Mode line construct to indicate a remote buffer.") ;;;###autoload (put 'mode-line-remote 'risky-local-variable t) diff --git a/lisp/desktop.el b/lisp/desktop.el index 12207f3cdac..40e6b364e45 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1516,8 +1516,15 @@ If there are no buffers left to create, kill the timer." (setq command-line-args (delete key command-line-args)) (desktop-save-mode 0))) (when desktop-save-mode - (desktop-read) - (setq inhibit-startup-screen t)))) + ;; People don't expect emacs -nw, or --daemon, + ;; to create graphical frames (bug#17693). + ;; TODO perhaps there should be a separate value + ;; for desktop-restore-frames to control this startup behavior? + (let ((desktop-restore-frames (and desktop-restore-frames + initial-window-system + (not (daemonp))))) + (desktop-read) + (setq inhibit-startup-screen t))))) ;; So we can restore vc-dir buffers. (autoload 'vc-dir-mode "vc-dir" nil t) diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index 0445891ed55..4fd9691d2a2 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el @@ -591,12 +591,19 @@ NOT-URGENT means it is ok to continue if the user says not to save." ;; Set up key bindings for use while editing log messages +(declare-function log-edit-empty-buffer-p "log-edit" ()) + (defun vc-log-edit (fileset mode backend) "Set up `log-edit' for use on FILE." (setq default-directory (buffer-local-value 'default-directory vc-parent-buffer)) + (require 'log-edit) (log-edit 'vc-finish-logentry - (= (point-min) (point-max)) + ;; Setup a new log message if the log buffer is "empty", + ;; or was previously used for a different set of files. + (or (log-edit-empty-buffer-p) + (and (local-variable-p 'vc-log-fileset) + (not (equal vc-log-fileset fileset)))) `((log-edit-listfun . (lambda () ;; FIXME: Should expand the list ;; for directories. |