diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 23 | ||||
| -rw-r--r-- | lisp/autorevert.el | 17 | ||||
| -rw-r--r-- | lisp/net/tramp-compat.el | 9 | ||||
| -rw-r--r-- | lisp/net/tramp-smb.el | 2 | ||||
| -rw-r--r-- | lisp/net/trampver.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 8 | ||||
| -rw-r--r-- | lisp/tool-bar.el | 6 |
7 files changed, 51 insertions, 18 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7620a0730a6..9d5416c5cea 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,26 @@ +2015-01-01 Eli Zaretskii <eliz@gnu.org> + + * tool-bar.el (tool-bar-local-item) + (tool-bar-local-item-from-menu): Call force-mode-line-update to + make sure the tool-bar changes show on display. + +2015-01-01 Michael Albinus <michael.albinus@gmx.de> + + Sync with Tramp 2.2.11. + + * net/tramp-compat.el (top): Require cl-macs for Emacs 22. + Make an alias for `default-toplevel-value' if it doesn't exist. + + * net/tramp-smb.el (tramp-smb-handle-copy-directory): + Use `tramp-compat-delete-directory'. + + * net/trampver.el: Update release number. + +2015-01-01 Filipp Gunbin <fgunbin@fastmail.fm> + + * autorevert.el (auto-revert-handler): Fix auto-revert-tail-mode + for remote files. (Bug#19449) + 2015-01-01 Simen Heggestøyl <simenheg@gmail.com> (tiny change) * textmodes/css-mode.el (scss-mode): Fix typo (bug#19446). diff --git a/lisp/autorevert.el b/lisp/autorevert.el index f1074e22e51..08c5452c8fd 100644 --- a/lisp/autorevert.el +++ b/lisp/autorevert.el @@ -589,8 +589,8 @@ This is an internal function used by Auto-Revert Mode." ;; the values. (remote-file-name-inhibit-cache t) (revert - (or (and buffer-file-name - (or auto-revert-remote-files + (if buffer-file-name + (and (or auto-revert-remote-files (not (file-remote-p buffer-file-name))) (or (not auto-revert-use-notify) auto-revert-notify-modified-p) @@ -603,11 +603,11 @@ This is an internal function used by Auto-Revert Mode." (funcall (or buffer-stale-function #'buffer-stale--default-function) t))) - (and (or auto-revert-mode - global-auto-revert-non-file-buffers) - (funcall (or buffer-stale-function - #'buffer-stale--default-function) - t)))) + (and (or auto-revert-mode + global-auto-revert-non-file-buffers) + (funcall (or buffer-stale-function + #'buffer-stale--default-function) + t)))) eob eoblist) (setq auto-revert-notify-modified-p nil) (when revert @@ -690,8 +690,7 @@ the timer when no buffers need to be checked." (let ((bufs (if global-auto-revert-mode (buffer-list) auto-revert-buffer-list)) - (remaining ()) - (new ())) + remaining new) ;; Partition `bufs' into two halves depending on whether or not ;; the buffers are in `auto-revert-remaining-buffers'. The two ;; halves are then re-joined with the "remaining" buffers at the diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index de63d8c7c7a..62c1501a3de 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -35,6 +35,11 @@ (eval-and-compile + ;; GNU Emacs 22. + (unless (fboundp 'ignore-errors) + (load "cl" 'noerror) + (load "cl-macs" 'noerror)) + ;; Some packages must be required for XEmacs, because we compile ;; with -no-autoloads. (when (featurep 'xemacs) @@ -586,6 +591,10 @@ and replace a sub-expression, e.g. (setq matches (cons (substring string start l) matches)) ; leftover (apply #'concat (nreverse matches)))))) +;; `default-toplevel-value' has been declared in Emacs 24. +(unless (fboundp 'default-toplevel-value) + (defalias 'default-toplevel-value 'symbol-value)) + (add-hook 'tramp-unload-hook (lambda () (unload-feature 'tramp-loaddefs 'force) diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 3d48f47e58e..8f6a10221b6 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -513,7 +513,7 @@ pass to the OPERATION." ;; Reset the transfer process properties. (tramp-set-connection-property v "process-name" nil) (tramp-set-connection-property v "process-buffer" nil) - (when t1 (delete-directory tmpdir 'recurse)))) + (when t1 (tramp-compat-delete-directory tmpdir 'recurse)))) ;; Handle KEEP-DATE argument. (when keep-date diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 065c3f33ebe..f1c36b8603e 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -31,7 +31,7 @@ ;; should be changed only there. ;;;###tramp-autoload -(defconst tramp-version "2.2.11-pre" +(defconst tramp-version "2.2.11-24.5" "This version of Tramp.") ;;;###tramp-autoload @@ -44,7 +44,7 @@ (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" - (format "Tramp 2.2.11-pre is not fit for %s" + (format "Tramp 2.2.11-24.5 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index c46c5d68019..a1ef9a6fca2 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2767,7 +2767,7 @@ the python shell: (concat (format "# -*- coding: %s -*-\n" encoding) (make-string - ;; Substract 2 because of the coding cookie. + ;; Subtract 2 because of the coding cookie. (- (line-number-at-pos start) 2) ?\n)))) (toplevel-block-p (save-excursion (goto-char start) @@ -4406,7 +4406,7 @@ operator." (defun python-info-encoding-from-cookie () "Detect current buffer's encoding from its coding cookie. -Returns the enconding as a symbol." +Returns the encoding as a symbol." (let ((first-two-lines (save-excursion (save-restriction @@ -4423,9 +4423,9 @@ Returns the enconding as a symbol." "Return encoding for file. Try `python-info-encoding-from-cookie', if none is found then default to utf-8." - ;; If no enconding is defined, then it's safe to use UTF-8: Python 2 + ;; If no encoding is defined, then it's safe to use UTF-8: Python 2 ;; uses ASCII as default while Python 3 uses UTF-8. This means that - ;; in the worst case escenario python.el will make things work for + ;; in the worst case scenario python.el will make things work for ;; Python 2 files with unicode data and no encoding defined. (or (python-info-encoding-from-cookie) 'utf-8)) diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el index 6e5c8b7c44c..6b732e9fb3f 100644 --- a/lisp/tool-bar.el +++ b/lisp/tool-bar.el @@ -174,7 +174,8 @@ is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally ICON.xbm, using `find-image'." (let* ((image-exp (tool-bar--image-expression icon))) (define-key-after map (vector key) - `(menu-item ,(symbol-name key) ,def :image ,image-exp ,@props)))) + `(menu-item ,(symbol-name key) ,def :image ,image-exp ,@props)) + (force-mode-line-update))) ;;;###autoload (defun tool-bar-add-item-from-menu (command icon &optional map &rest props) @@ -239,7 +240,8 @@ holds a keymap." (if (and (consp rest) (consp (car rest))) (setq rest (cdr rest))) (append `(menu-item ,(car defn) ,rest) - (list :image image-exp) props))))))) + (list :image image-exp) props)))) + (force-mode-line-update)))) ;;; Set up some global items. Additions/deletions up for grabs. |