From d236329b5285004b6b25317614c6a42d7d4e516f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 3 Nov 2014 23:07:04 -0800 Subject: * lisp/mail/emacsbug.el (report-emacs-bug): No longer include recent-keys Fixes: debbugs:18900 --- lisp/ChangeLog | 5 +++++ lisp/mail/emacsbug.el | 22 +++------------------- 2 files changed, 8 insertions(+), 19 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 41e1039347c..d0d61da52f4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-04 Glenn Morris + + * mail/emacsbug.el (report-emacs-bug): No longer include + recent-keys in the report. (Bug#18900) + 2014-11-03 Michael Albinus * net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Use a diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index b994949e94d..d0c575a9c79 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -143,11 +143,12 @@ 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. + (declare (advertised-calling-convention (topic) "24.5")) (interactive (reverse (list (recent-keys) (read-string "Bug Subject: ")))) ;; The syntax `version;' is preferred to `[version]' because the ;; latter could be mistakenly stripped by mailing software. @@ -276,23 +277,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 @@ -301,7 +285,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. -- cgit v1.2.3 From 46fc78f57e9be79e144303066b9164b000af76fa Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 3 Nov 2014 23:11:37 -0800 Subject: * lisp/mail/emacsbug.el (report-emacs-bug): Simplify interactive spec. --- lisp/mail/emacsbug.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lisp') diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index d0c575a9c79..329a3209cee 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -146,10 +146,8 @@ This requires either the OS X \"open\" command, or the freedesktop (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. (declare (advertised-calling-convention (topic) "24.5")) - (interactive (reverse (list (recent-keys) (read-string "Bug Subject: ")))) + (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) -- cgit v1.2.3 From b6ad705482c2b6e42e9d38f427765fc56319567e Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 4 Nov 2014 10:02:56 +0100 Subject: * 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. Fixes: debbugs:18751 --- lisp/ChangeLog | 6 ++++++ lisp/net/tramp-sh.el | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d0d61da52f4..12a140d445d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-11-04 Michael Albinus + + * 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-04 Glenn Morris * mail/emacsbug.el (report-emacs-bug): No longer include 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) -- cgit v1.2.3 From a1740a150d2d15189b0e93878845e62a569c257f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 4 Nov 2014 18:30:48 +0200 Subject: Fix error messages from jit-stealth-lock when load-average returns nil. lisp/jit-lock.el (jit-lock-stealth-fontify): Be tolerant to nil being returned by load-average. --- lisp/ChangeLog | 5 +++++ lisp/jit-lock.el | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 12a140d445d..bad4def88f2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-04 Eli Zaretskii + + * jit-lock.el (jit-lock-stealth-fontify): Be tolerant to nil being + returned by load-average. + 2014-11-04 Michael Albinus * net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Don't use diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el index 42e6519e38c..97df89a12d9 100644 --- a/lisp/jit-lock.el +++ b/lisp/jit-lock.el @@ -503,7 +503,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) -- cgit v1.2.3 From 6cd9d8c94dd81f7aa1753b1c6320d089f0fe6fcd Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 4 Nov 2014 15:07:59 -0500 Subject: * lisp/erc/erc.el (erc-send-input): Bind `str' dynamically. Fixes: debbugs:18936 --- lisp/erc/ChangeLog | 4 ++++ lisp/erc/erc.el | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index ca018c47db8..869befc1191 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2014-11-04 Stefan Monnier + + * erc.el (erc-send-input): Bind `str' dynamically (bug#18936). + 2014-10-20 Glenn Morris * Version 24.4 released. diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index d93e9e02156..3a107c69f9a 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -975,7 +975,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 @@ -5268,6 +5268,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) -- cgit v1.2.3