diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index ff4a3355e54..defdabc4d8f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,9 @@ +2011-05-03 Peter Münster + + * gnus.texi (Summary Buffer Lines): + gnus-summary-user-date-format-alist does not exist. + (Sorting the Summary Buffer): More about sorting threads. + 2011-04-25 Michael Albinus * trampver.texi: Update release number. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 9d9b767bcba..a35a7e85794 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -4953,7 +4953,7 @@ Download mark. Desired cursor position (instead of after first colon). @item &user-date; Age sensitive date format. Various date format is defined in -@code{gnus-summary-user-date-format-alist}. +@code{gnus-user-date-format-alist}. @item u User defined specifier. The next character in the format string should be a letter. Gnus will call the function @@ -7340,7 +7340,9 @@ predicate functions include @code{gnus-thread-sort-by-number}, Each function takes two threads and returns non-@code{nil} if the first thread should be sorted before the other. Note that sorting really is -normally done by looking only at the roots of each thread. +normally done by looking only at the roots of each thread. Exceptions +to this rule are @code{gnus-thread-sort-by-most-recent-number} and +@code{gnus-thread-sort-by-most-recent-date}. If you use more than one function, the primary sort key should be the last function in the list. You should probably always include diff --git a/lisp/ChangeLog b/lisp/ChangeLog index aa9052adfb4..2c1ab1c7f6f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,27 @@ +2011-05-03 Chong Yidong + + * emacs-lisp/autoload.el (generated-autoload-file): Doc fix (Bug#7989). + +2011-05-03 Agustín Martín Domingo + + * textmodes/ispell.el (ispell-add-per-file-word-list): + Use `concat' to create string for insertion. + +2011-05-03 Stefan Monnier + + * textmodes/bibtex.el (bibtex-fill-field-bounds, bibtex-fill-entry): + Avoid open-line which runs post-self-insert-hook. + (bibtex-fill-entry): Remove unused `end' var. + +2011-05-03 Dirk Ullrich (tiny change) + + * textmodes/ispell.el (ispell-add-per-file-word-list): + Protect against `nil' value of `comment-start' (Bug#8579). + 2011-05-03 Leo Liu * isearch.el (isearch-yank-pop): New command. - (isearch-mode-map): bind it to `M-y'. + (isearch-mode-map): Bind it to `M-y'. (isearch-forward): Mention it. 2011-05-03 Stefan Monnier diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 5a5d6b88a2d..dffbf3418ca 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -35,10 +35,18 @@ (eval-when-compile (require 'cl)) (defvar generated-autoload-file "loaddefs.el" - "*File \\[update-file-autoloads] puts autoloads into. -A `.el' file can set this in its local variables section to make its -autoloads go somewhere else. The autoload file is assumed to contain a -trailer starting with a FormFeed character.") + "File \\[update-file-autoloads] puts autoloads into. +A Lisp file can set this in its local variables section to make +its autoloads go somewhere else. + +If this is a relative file name, the directory is determined as +follows: + - If a Lisp file defined `generated-autoload-file' as a + file-local variable, use its containing directory. + - Otherwise use the \"lisp\" subdirectory of `source-directory'. + +The autoload file is assumed to contain a trailer starting with a +FormFeed character.") ;;;###autoload (put 'generated-autoload-file 'safe-local-variable 'stringp) diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index bf9e1e21e0e..187d338c1bc 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,8 @@ +2011-05-03 Debarshi Ray (tiny change) + + * erc-backend.el (671): New response handler. + * erc.el (english): Add 671 to catalog. + 2011-04-29 Stefan Monnier * erc-pcomplete.el (erc-pcomplete-nick-postfix): Remove the " " in the diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 8a25e5f600d..d363ea92bdb 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -1951,6 +1951,13 @@ See `erc-display-server-message'." nil (erc-display-message parsed '(error notice) 'active 's482 ?c channel ?m message))) +(define-erc-response-handler (671) + "Secure connection response in WHOIS." nil + (let ((nick (second (erc-response.command-args parsed))) + (securemsg (erc-response.contents parsed))) + (erc-display-message parsed 'notice 'active 's671 + ?n nick ?a securemsg))) + (define-erc-response-handler (431 445 446 451 462 463 464 481 483 484 485 491 501 502) ;; 431 - No nickname given diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index e2228a43303..a8c592696ad 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -6351,7 +6351,8 @@ All windows are opened in the current frame." (s485 . "You're not the original channel operator") (s491 . "No O-lines for your host") (s501 . "Unknown MODE flag") - (s502 . "You can't change modes for other users"))) + (s502 . "You can't change modes for other users") + (s671 . "%n %a"))) (defun erc-message-english-PART (&rest args) "Format a proper PART message. diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 784f374bafa..a6d857ed660 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,10 @@ +2011-05-03 Teodor Zlatanov + + * shr.el: Add shr-link face for links. + (shr-urlify): Use it. + + * registry.el (registry-insert): Make error message more helpful. + 2011-05-02 Lars Magne Ingebrigtsen * gnus-html.el (gnus-html-schedule-image-fetching): Use diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el index 1a18dbd50d2..e82ca8d9b6f 100644 --- a/lisp/gnus/registry.el +++ b/lisp/gnus/registry.el @@ -272,7 +272,7 @@ Errors out if the key exists already." (assert (< (registry-size db) (oref db :max-hard)) nil - "max-hard size limit reached") + "registry max-hard size limit reached") ;; store the entry (puthash key entry (oref db :data)) diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index b2e4f1dc61d..d865b2d6087 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el @@ -91,6 +91,12 @@ cid: URL as the argument.") "Font for elements." :group 'shr) +(defface shr-link '((t (:underline t) + (:foreground "yellow") + (:background "black"))) + "Font for elements." + :group 'shr) + ;;; Internal variables. (defvar shr-folding-mode nil) @@ -591,6 +597,7 @@ START, and END. Note that START and END should be merkers." :help-echo (if title (format "%s (%s)" url title) url) :keymap shr-map url) + (put-text-property start (point) 'face 'shr-link) (put-text-property start (point) 'shr-url url)) (defun shr-encode-url (url) diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index 2d2c0380a4a..e49d7549776 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -4313,8 +4313,7 @@ If optional arg MOVE is non-nil move point to end of field." (goto-char (bibtex-start-of-field bounds)) (forward-char) ; leading comma (bibtex-delete-whitespace) - (open-line 1) - (forward-char) + (insert "\n") (indent-to-column (+ bibtex-entry-offset bibtex-field-indentation)) (re-search-forward "[ \t\n]*=" end-field) @@ -4352,7 +4351,6 @@ column `bibtex-text-indentation' and continuation lines start here, too. If `bibtex-align-at-equal-sign' is non-nil, align equal signs, too." (interactive "*") (let ((pnt (copy-marker (point))) - (end (copy-marker (bibtex-end-of-entry))) (beg (bibtex-beginning-of-entry)) ; move point bounds) (bibtex-delete-whitespace) @@ -4364,8 +4362,7 @@ If `bibtex-align-at-equal-sign' is non-nil, align equal signs, too." (forward-char)) (skip-chars-backward " \t\n") (bibtex-delete-whitespace) - (open-line 1) - (forward-char) + (insert "\n") (indent-to-column bibtex-entry-offset) (goto-char pnt))) diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 35409d64289..c196218feec 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -3915,14 +3915,18 @@ Both should not be used to define a buffer-local dictionary." (progn (open-line 1) (unless found (newline)) - (insert (if (fboundp 'comment-padright) - ;; Try and use the proper comment marker, - ;; e.g. ";;" rather than ";". - (comment-padright comment-start - (comment-add nil)) - comment-start) - " " ispell-words-keyword) - (if (> (length comment-end) 0) + (insert (if comment-start + (concat + (if (fboundp 'comment-padright) + ;; Try and use the proper comment marker, + ;; e.g. ";;" rather than ";". + (comment-padright comment-start + (comment-add nil)) + comment-start) + " ") + "") + ispell-words-keyword) + (if (and comment-end (> (length comment-end) 0)) (save-excursion (newline) (insert comment-end))))) diff --git a/src/ChangeLog b/src/ChangeLog index 0bcad1118b6..c1f43f4313d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,4 +1,4 @@ -2011-05-03 Paul Eggert +2011-05-04 Paul Eggert Arithmetic overflows now return float rather than wrapping around. (Bug#8611). @@ -108,6 +108,11 @@ * fns.c (Frandom): Let EMACS_UINT be wider than unsigned long. +2011-05-03 Jan Djärv + + * xterm.c (x_set_frame_alpha): Do not set property on anything + else than FRAME_X_OUTER_WINDOW (Bug#8608). + 2011-05-02 Juanma Barranquero * sysdep.c (get_tty_size) [WINDOWSNT]: Implement. (Bug#8596) diff --git a/src/xterm.c b/src/xterm.c index 491a8b3698f..20259b7ab2e 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -454,11 +454,6 @@ x_set_frame_alpha (struct frame *f) double alpha_min = 1.0; unsigned long opac; - if (FRAME_X_DISPLAY_INFO (f)->root_window != FRAME_X_OUTPUT (f)->parent_desc) - /* Since the WM decoration lies under the FRAME_OUTER_WINDOW, - we must treat the former instead of the latter. */ - win = FRAME_X_OUTPUT (f)->parent_desc; - if (dpyinfo->x_highlight_frame == f) alpha = f->alpha[0]; else