diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 16 | ||||
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 3 | ||||
| -rw-r--r-- | lisp/jit-lock.el | 5 | ||||
| -rw-r--r-- | lisp/mail/emacsbug.el | 26 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 13 |
6 files changed, 37 insertions, 30 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4684c017d94..dc17f8e3ffb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +2014-11-05 Eli Zaretskii <eliz@gnu.org> + + * jit-lock.el (jit-lock-stealth-fontify): Be tolerant to nil being + returned by load-average. + +2014-11-05 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Don't use + a local copy; setting `inhibit-file-name-handlers' proper might be + more performant. (Bug#18751) + +2014-11-05 Glenn Morris <rgm@gnu.org> + + * mail/emacsbug.el (report-emacs-bug): No longer include + recent-keys in the report. (Bug#18900) + 2014-11-04 Paul Eggert <eggert@cs.ucla.edu> * mouse.el (mouse-drag-line): Fix misspelling of "right-fringe". diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 75a01581fcd..0875994e775 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2014-11-05 Stefan Monnier <monnier@iro.umontreal.ca> + + * erc.el (erc-send-input): Bind `str' dynamically (bug#18936). + 2014-10-29 Paul Eggert <eggert@cs.ucla.edu> Simplify use of current-time and friends. diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 3bb68abfc9e..37b24eaaa60 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1005,7 +1005,7 @@ display of that particular string at all." "Hook called first when some text is sent through `erc-send-current-line'. It gets called with one argument, STRING. -To change the text that will be sent, set the variable STR which is +To change the text that will be sent, set the variable `str' which is used in `erc-send-current-line'. To change the text inserted into the buffer without changing the text @@ -5361,6 +5361,7 @@ This returns non-nil only if we actually send anything." (beep)) nil) (t + (defvar str) ;; FIXME: Make it obey the "erc-" prefix convention. (let ((str input) (erc-insert-this t)) (setq erc-send-this t) diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el index d346f050415..34f14a5af63 100644 --- a/lisp/jit-lock.el +++ b/lisp/jit-lock.el @@ -499,7 +499,10 @@ non-nil in a repeated invocation of this function." message-log-max start) (if (and jit-lock-stealth-load - (> (car (load-average)) jit-lock-stealth-load)) + ;; load-average can return nil. The w32 emulation does + ;; that during the first few dozens of seconds after + ;; startup. + (> (or (car (load-average)) 0) jit-lock-stealth-load)) ;; Wait a little if load is too high. (setq delay jit-lock-stealth-time) (if (buffer-live-p buffer) diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index 91451504cab..4e3eb324e59 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -138,12 +138,11 @@ This requires either the OS X \"open\" command, or the freedesktop (error "Subject, To or body not found"))))) ;;;###autoload -(defun report-emacs-bug (topic &optional recent-keys) +(defun report-emacs-bug (topic &optional unused) "Report a bug in GNU Emacs. Prompts for bug subject. Leaves you in a mail buffer." - ;; This strange form ensures that (recent-keys) is the value before - ;; the bug subject string is read. - (interactive (reverse (list (recent-keys) (read-string "Bug Subject: ")))) + (declare (advertised-calling-convention (topic) "24.5")) + (interactive "sBug Subject: ") ;; The syntax `version;' is preferred to `[version]' because the ;; latter could be mistakenly stripped by mailing software. (if (eq system-type 'ms-dos) @@ -273,23 +272,6 @@ usually do not have translators for other languages.\n\n"))) (and (boundp mode) (buffer-local-value mode from-buffer) (insert (format " %s: %s\n" mode (buffer-local-value mode from-buffer))))) - (insert "\n") - (insert "Recent input:\n") - (let ((before-keys (point))) - (insert (mapconcat (lambda (key) - (if (or (integerp key) - (symbolp key) - (listp key)) - (single-key-description key) - (prin1-to-string key nil))) - (or recent-keys (recent-keys)) - " ")) - (save-restriction - (narrow-to-region before-keys (point)) - (goto-char before-keys) - (while (progn (move-to-column 50) (not (eobp))) - (search-forward " " nil t) - (insert "\n")))) (let ((message-buf (get-buffer "*Messages*"))) (if message-buf (let (beg-pos @@ -298,7 +280,7 @@ usually do not have translators for other languages.\n\n"))) (goto-char end-pos) (forward-line -10) (setq beg-pos (point))) - (insert "\n\nRecent messages:\n") + (insert "\nRecent messages:\n") (insert-buffer-substring message-buf beg-pos end-pos)))) ;; After Recent messages, to avoid the messages produced by ;; list-load-path-shadows. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index a72a79a7797..3103eb0daa2 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -2061,15 +2061,16 @@ FILENAME is the source file, NEWNAME the target file. KEEP-DATE is non-nil if NEWNAME should have the same timestamp as FILENAME." (with-temp-buffer ;; We must disable multibyte, because binary data shall not be - ;; converted. `insert-file-contents-literally' does not support - ;; file name handlers for GNU Emacs; we must create a local copy - ;; therefore. + ;; converted. We remove `tramp-file-name-handler' from + ;; `inhibit-file-name-handlers'; otherwise the file name handler + ;; for `insert-file-contents' might be deactivated in some corner + ;; cases. (set-buffer-multibyte nil) (let ((coding-system-for-read 'binary) (jka-compr-inhibit t) - (tmpfile (file-local-copy filename))) - (insert-file-contents-literally (or tmpfile filename)) - (when tmpfile (delete-file tmpfile))) + (inhibit-file-name-handlers + (remq 'tramp-file-name-handler inhibit-file-name-handlers))) + (insert-file-contents-literally filename)) ;; We don't want the target file to be compressed, so we let-bind ;; `jka-compr-inhibit' to t. (let ((coding-system-for-write 'binary) |