[gnus git] branch master updated: n0-17-415-g1798218 =1= message.el (message-pop-to-buffer): Partially revert 2011-11-30 change (Bug#10200). By Chong Yidong <[email protected]>. Spelling fixes by Paul Eggert <[email protected]>.
Katsumi Yamaoka <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 1798218bb67a4451295720fc8623979d8ca7c301 (commit)
from e2273ac05778fbb04c6cd44a39766cfd3feb9d70 (commit)
- Log -----------------------------------------------------------------
commit 1798218bb67a4451295720fc8623979d8ca7c301
Author: Emacs developers <[email protected]>
Date: Sun Dec 4 08:43:09 2011 +0000
message.el (message-pop-to-buffer): Partially revert 2011-11-30 change (Bug#10200). By Chong Yidong <[email protected]>.
Spelling fixes by Paul Eggert <[email protected]>.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a4bb0a..28c7392 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2011-12-04 Paul Eggert <[email protected]>
+
+ * gnus-fun.el (gnus-fun-ppm-change-string):
+ * gnus-msg.el (gnus-inews-do-gcc):
+ * gnus-sum.el (gnus-summary-find-for-reselect):
+ * gnus.el (gnus-summary-cancelled):
+ * message.el (message-cancel-hook, message-send-news)
+ * nndiary.el (nndiary-headers, nndiary-parse-schedule-value):
+ * nnir.el (nnir-run-hyrex):
+ * nntp.el (nntp-with-open-group-function):
+ * pgg.el (pgg-pending-timers): Spelling fix.
+
+2011-12-04 Chong Yidong <[email protected]>
+
+ * message.el (message-pop-to-buffer): Partially revert 2011-11-30
+ change (Bug#10200).
+
2011-12-02 Katsumi Yamaoka <[email protected]>
* compface.el (uncompface):
diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index 08ec3c4..44cb158 100644
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -274,10 +274,10 @@ colors of the displayed X-Faces."
result))
(defun gnus-fun-ppm-change-string ()
- (let* ((possibilites '("%02x0000" "00%02x00" "0000%02x"
+ (let* ((possibilities '("%02x0000" "00%02x00" "0000%02x"
"%02x%02x00" "00%02x%02x" "%02x00%02x"))
(format (concat "'#%02x%02x%02x' '#"
- (nth (random 6) possibilites)
+ (nth (random 6) possibilities)
"'"))
(values nil))
(dotimes (i 255)
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index e06d475..5837352 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1588,7 +1588,7 @@ this is a reply."
;; BUG: We really need to get the charset for
;; each name in the Newsgroups and Followup-To
;; lines to allow crossposting between group
- ;; namess with incompatible character sets.
+ ;; names with incompatible character sets.
;; -- Per Abrahamsen <[email protected]> 2001-10-08.
(group-field-charset
(gnus-group-name-charset
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index b3f85cf..7108106 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7087,7 +7087,7 @@ With ARG, turn line truncation on if ARG is positive."
(defun gnus-summary-find-for-reselect ()
"Return the number of an article to stay on across a reselect.
The current article is considered, then following articles, then previous
-articles. An article is sought which is not cancelled and isn't a temporary
+articles. An article is sought which is not canceled and isn't a temporary
insertion from another group. If there's no such then return a dummy 0."
(let (found)
(dolist (rev '(nil t))
diff --git a/lisp/gnus.el b/lisp/gnus.el
index c8779c9..a29bec2 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -699,7 +699,7 @@ be set in `.emacs' instead."
(defface gnus-summary-cancelled
'((((class color))
(:foreground "yellow" :background "black")))
- "Face used for cancelled articles."
+ "Face used for canceled articles."
:group 'gnus-summary)
;; backward-compatibility alias
(put 'gnus-summary-cancelled-face 'face-alias 'gnus-summary-cancelled)
diff --git a/lisp/message.el b/lisp/message.el
index 3a2e1b9..ecb6dbd 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -934,7 +934,7 @@ The function `message-setup' runs this hook."
:type 'hook)
(defcustom message-cancel-hook nil
- "Hook run when cancelling articles."
+ "Hook run when canceling articles."
:group 'message-various
:link '(custom-manual "(message)Various Message Variables")
:type 'hook)
@@ -4884,7 +4884,7 @@ Otherwise, generate and save a value for `canlock-password' first."
(message-fetch-field "Followup-To")))
;; BUG: We really need to get the charset for each name in the
;; Newsgroups and Followup-To lines to allow crossposting
- ;; between group namess with incompatible character sets.
+ ;; between group names with incompatible character sets.
;; -- Per Abrahamsen <[email protected]> 2001-10-08.
(group-field-charset
(gnus-group-name-charset method newsgroups-field))
@@ -6371,7 +6371,6 @@ between beginning of field and beginning of line."
(defun message-pop-to-buffer (name &optional switch-function)
"Pop to buffer NAME, and warn if it already exists and is modified."
- (unless switch-function (setq switch-function #'pop-to-buffer))
(let ((buffer (get-buffer name)))
(if (and buffer
(buffer-name buffer))
@@ -6381,7 +6380,7 @@ between beginning of field and beginning of line."
(progn
(gnus-select-frame-set-input-focus (window-frame window))
(select-window window))
- (funcall switch-function buffer)
+ (funcall (or switch-function #'pop-to-buffer) buffer)
(set-buffer buffer))
(when (and (buffer-modified-p)
(not (prog1
@@ -6389,7 +6388,7 @@ between beginning of field and beginning of line."
"Message already being composed; erase? ")
(message nil))))
(error "Message being composed")))
- (funcall switch-function name)
+ (funcall (or switch-function #'pop-to-buffer-same-window) name)
(set-buffer name))
(erase-buffer)
(message-mode)))
diff --git a/lisp/nndiary.el b/lisp/nndiary.el
index 043356c..25557ad 100644
--- a/lisp/nndiary.el
+++ b/lisp/nndiary.el
@@ -353,7 +353,7 @@ all. This may very well take some time.")
;; List of NNDiary headers that specify the time spec. Each header name is
;; followed by either two integers (specifying a range of possible values
;; for this header) or one list (specifying all the possible values for this
- ;; header). In the latter case, the list does NOT include the unspecifyed
+ ;; header). In the latter case, the list does NOT include the unspecified
;; spec (*).
;; For time zone values, we have symbolic time zone names associated with
;; the (relative) number of seconds ahead GMT.
@@ -1163,9 +1163,9 @@ all. This may very well take some time.")
;; Parse the schedule string STR, or signal an error.
;; Signals are caught by `nndary-schedule'.
(if (string-match "[ \t]*\\*[ \t]*" str)
- ;; unspecifyed
+ ;; unspecified
nil
- ;; specifyed
+ ;; specified
(if (listp min-or-values)
;; min-or-values is values
;; #### NOTE: this is actually only a hack for time zones.
diff --git a/lisp/nnir.el b/lisp/nnir.el
index 78d2478..3d0fc78 100644
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -1273,8 +1273,8 @@ Tested with swish-e-2.0.1 on Windows NT 4.0."
(message "Doing hyrex-search query \"%s\"...done" qstring)
(sit-for 0)
;; nnir-search returns:
- ;; for nnml/nnfolder: "filename mailid weigth"
- ;; for nnimap: "group mailid weigth"
+ ;; for nnml/nnfolder: "filename mailid weight"
+ ;; for nnimap: "group mailid weight"
(goto-char (point-min))
(delete-non-matching-lines "^\\S + [0-9]+ [0-9]+$")
;; HyREX doesn't search directly in groups -- so filter out here.
diff --git a/lisp/nntp.el b/lisp/nntp.el
index 9816c20..f4b8ce6 100644
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -665,7 +665,7 @@ command whose response triggered the error."
(process-buffer -process))))
;; When I an able to identify the
;; connection to the server AND I've
- ;; received NO reponse for
+ ;; received NO response for
;; nntp-connection-timeout seconds.
(when (and -buffer (eq 0 (buffer-size -buffer)))
;; Close the connection. Take no
diff --git a/lisp/pgg.el b/lisp/pgg.el
index 9929421..0412308 100644
--- a/lisp/pgg.el
+++ b/lisp/pgg.el
@@ -174,7 +174,7 @@ is true, or else the output buffer is displayed."
(defvar pgg-pending-timers (make-vector 7 0)
"Hash table for managing scheduled pgg cache management timers.
-We associate key and timer, so the timer can be cancelled if a new
+We associate key and timer, so the timer can be canceled if a new
timeout for the key is set while an old one is still pending.")
(defun pgg-read-passphrase (prompt &optional key notruncate)
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 9c6cf58..b976e76 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-04 Paul Eggert <[email protected]>
+
+ * message.el (Insertion Variables): Spelling fix.
+
2011-11-27 Paul Eggert <[email protected]>
* gnus.texi (Propagating marks, Red Gnus): Spelling fix.
diff --git a/texi/message.texi b/texi/message.texi
index 909292f..abcbf28 100644
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -1974,7 +1974,7 @@ that look like:
Hallvard B Furuseth <h.b.furuseth@@usit.uio.no> writes:
@end example
-@c FIXME: Add `message-insert-formated-citation-line' and
+@c FIXME: Add `message-insert-formatted-citation-line' and
@c `message-citation-line-format'
Point will be at the beginning of the body of the message when this
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 17 +++++++++++++++++
lisp/gnus-fun.el | 6 +++---
lisp/gnus-msg.el | 2 +-
lisp/gnus-sum.el | 2 +-
lisp/gnus.el | 2 +-
lisp/message.el | 9 ++++-----
lisp/nndiary.el | 6 +++---
lisp/nnir.el | 4 ++--
lisp/nntp.el | 2 +-
lisp/pgg.el | 2 +-
texi/ChangeLog | 4 ++++
texi/message.texi | 2 +-
12 files changed, 39 insertions(+), 19 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project