[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118290: Merge from emacs-24; up to 117669
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r118290: Merge from emacs-24; up to 117669 |
Date: |
Wed, 05 Nov 2014 05:09:25 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118290 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2014-11-04 21:08:57 -0800
message:
Merge from emacs-24; up to 117669
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/erc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-4305
lisp/erc/erc.el erc.el-20091113204419-o5vbwnq5f7feedwu-4346
lisp/jit-lock.el jitlock.el-20091113204419-o5vbwnq5f7feedwu-1321
lisp/mail/emacsbug.el emacsbug.el-20091113204419-o5vbwnq5f7feedwu-73
lisp/net/tramp-sh.el trampsh.el-20100913133439-a1faifh29eqoi4nh-1
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-11-05 05:01:47 +0000
+++ b/ChangeLog 2014-11-05 05:08:57 +0000
@@ -2338,7 +2338,7 @@
2012-12-13 Andreas Schwab <address@hidden>
* Makefile.in (install-info): Use `${MAKE} -s' for echo-info.
- (uninstall): Likewise. (Bug#13143)
+ (uninstall): Likewise. (Bug#13142)
2012-12-11 Paul Eggert <address@hidden>
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-11-04 17:46:49 +0000
+++ b/lisp/ChangeLog 2014-11-05 05:08:57 +0000
@@ -1,3 +1,19 @@
+2014-11-05 Eli Zaretskii <address@hidden>
+
+ * jit-lock.el (jit-lock-stealth-fontify): Be tolerant to nil being
+ returned by load-average.
+
+2014-11-05 Michael Albinus <address@hidden>
+
+ * 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 <address@hidden>
+
+ * mail/emacsbug.el (report-emacs-bug): No longer include
+ recent-keys in the report. (Bug#18900)
+
2014-11-04 Paul Eggert <address@hidden>
* mouse.el (mouse-drag-line): Fix misspelling of "right-fringe".
=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog 2014-10-29 01:42:51 +0000
+++ b/lisp/erc/ChangeLog 2014-11-05 05:08:57 +0000
@@ -1,3 +1,7 @@
+2014-11-05 Stefan Monnier <address@hidden>
+
+ * erc.el (erc-send-input): Bind `str' dynamically (bug#18936).
+
2014-10-29 Paul Eggert <address@hidden>
Simplify use of current-time and friends.
=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el 2014-10-29 03:21:06 +0000
+++ b/lisp/erc/erc.el 2014-11-05 05:08:57 +0000
@@ -1005,7 +1005,7 @@
"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 @@
(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)
=== modified file 'lisp/jit-lock.el'
--- a/lisp/jit-lock.el 2014-05-29 03:45:29 +0000
+++ b/lisp/jit-lock.el 2014-11-05 05:08:57 +0000
@@ -499,7 +499,10 @@
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)
=== modified file 'lisp/mail/emacsbug.el'
--- a/lisp/mail/emacsbug.el 2014-03-28 23:11:39 +0000
+++ b/lisp/mail/emacsbug.el 2014-11-05 05:08:57 +0000
@@ -138,12 +138,11 @@
(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 @@
(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 @@
(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.
=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el 2014-11-03 21:49:37 +0000
+++ b/lisp/net/tramp-sh.el 2014-11-05 05:08:57 +0000
@@ -2061,15 +2061,16 @@
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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118290: Merge from emacs-24; up to 117669,
Glenn Morris <=