mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-12 16:23:57 +00:00
Code Issues Releases Activity

Merge changes made in Gnus trunk.

Browse Source 
gnus.texi (Gnus Utility Functions): Add more references and explanations (bug#9683).
ecomplete.el (ecomplete-display-matches): Use a local keymap to handle bindings.
gnus-win.el (gnus-configure-windows): Protect against reading ephemeral groups outside of Gnus.
This commit is contained in:
Gnus developers 2011-10-06 22:11:15 +00:00 committed by Katsumi Yamaoka
parent 0181e1939e
commit 465d0300d4
5 changed files with 55 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/misc/ChangeLog
View File

@ -1,3 +1,8 @@
2011-10-06 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus.texi (Gnus Utility Functions): Add more references and
explanations (bug#9683).
2011-09-21 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus.texi (Archived Messages): Note the default (bug#9552).

14
doc/misc/gnus.texi
View File

@ -29093,7 +29093,7 @@ Takes an unprefixed group name and a select method, and returns the full
@item gnus-get-info
@findex gnus-get-info
Returns the group info list for @var{group}.
Returns the group info list for @var{group} (@pxref{Group Info}).
@item gnus-group-unread
@findex gnus-group-unread
@ -29102,7 +29102,8 @@ unknown.
@item gnus-active
@findex gnus-active
The active entry for @var{group}.
The active entry (i.e., a cons cell containing the lowest and highest
article numbers) for @var{group}.
@item gnus-set-active
@findex gnus-set-active
@ -29137,7 +29138,9 @@ Returns the select method corresponding to @var{server}.
@item gnus-server-equal
@findex gnus-server-equal
Says whether two virtual servers are equal.
Says whether two virtual servers are essentially equal. For instance,
two virtual servers may have server parameters in different order, but
this function will consider them equal.
@item gnus-group-native-p
@findex gnus-group-native-p
@ -29153,8 +29156,9 @@ Says whether @var{group} is foreign or not.
@item gnus-group-find-parameter
@findex gnus-group-find-parameter
Returns the parameter list of @var{group}. If given a second parameter,
returns the value of that parameter for @var{group}.
Returns the parameter list of @var{group} (@pxref{Group Parameters}).
If given a second parameter, returns the value of that parameter for
@var{group}.
@item gnus-group-set-parameter
@findex gnus-group-set-parameter

10
lisp/gnus/ChangeLog
View File

@ -1,3 +1,13 @@
2011-09-22 Kan-Ru Chen <kanru@kanru.info>
* ecomplete.el (ecomplete-display-matches): Use a local keymap to
handle bindings.
2011-10-06 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-win.el (gnus-configure-windows): Protect against reading
ephemeral groups outside of Gnus.
2011-10-06 Katsumi Yamaoka <yamaoka@jpl.org>
* shr.el (shr-tag-img): Don't get images displayed in tables.

32
lisp/gnus/ecomplete.el
View File

@ -27,6 +27,11 @@
(eval-when-compile
(require 'cl))
(eval-when-compile
(when (featurep 'xemacs)
;; The `kbd' macro requires that the `read-kbd-macro' macro is available.
(require 'edmacro)))
(defgroup ecomplete nil
"Electric completion of email addresses and the like."
:group 'mail)
@ -123,15 +128,24 @@
(message "%s" matches)
nil)
(setq highlight (ecomplete-highlight-match-line matches line))
(while (not (memq (setq command (read-event highlight)) '(? return)))
(cond
((eq command ?\M-n)
(setq line (min (1+ line) max-lines)))
((eq command ?\M-p)
(setq line (max (1- line) 0))))
(setq highlight (ecomplete-highlight-match-line matches line)))
(when (eq command 'return)
(nth line (split-string matches "\n")))))))
(let ((local-map (make-sparse-keymap))
selected)
(define-key local-map (kbd "RET")
(lambda () (setq selected (nth line (split-string matches "\n")))))
(define-key local-map (kbd "M-n")
(lambda () (setq line (min (1+ line) max-lines))))
(define-key local-map (kbd "M-p")
(lambda () (setq line (max (1- line) 0))))
(let ((overriding-local-map local-map))
(while (and (null selected)
(setq command (read-key-sequence highlight))
(lookup-key local-map command))
(apply (key-binding command) nil)
(setq highlight (ecomplete-highlight-match-line matches line))))
(if selected
(message selected)
(message "Abort"))
selected)))))
(defun ecomplete-highlight-match-line (matches line)
(with-temp-buffer

11
lisp/gnus/gnus-win.el
View File

@ -358,8 +358,13 @@ See the Gnus manual for an explanation of the syntax used.")
(defvar gnus-frame-split-p nil)
(defun gnus-configure-windows (setting &optional force)
(if (window-configuration-p setting)
(set-window-configuration setting)
(cond
((null setting)
;; Do nothing.
)
((window-configuration-p setting)
(set-window-configuration setting))
(t
(setq gnus-current-window-configuration setting)
(setq force (or force gnus-always-force-window-configuration))
(let ((split (if (symbolp setting)
@ -410,7 +415,7 @@ See the Gnus manual for an explanation of the syntax used.")
(run-hooks 'gnus-configure-windows-hook)
(when gnus-window-frame-focus
(gnus-select-frame-set-input-focus
(window-frame gnus-window-frame-focus))))))))
(window-frame gnus-window-frame-focus)))))))))
(defun gnus-delete-windows-in-gnusey-frames ()
"Do a `delete-other-windows' in all frames that have Gnus windows."