mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-03 18:41:25 -08:00
Merge remote-tracking branch 'savannah/master' into HEAD
This commit is contained in:
commit
f8505fd3d4
100 changed files with 6098 additions and 2158 deletions
|
|
@ -137,6 +137,10 @@ appear in DOC, a paragraph is added to DOC explaining
|
|||
usage of the mode argument.
|
||||
|
||||
Optional INIT-VALUE is the initial value of the mode's variable.
|
||||
Note that the minor mode function won't be called by setting
|
||||
this option, so the value *reflects* the minor mode's natural
|
||||
initial state, rather than *setting* it.
|
||||
In the vast majority of cases it should be nil.
|
||||
Optional LIGHTER is displayed in the mode line when the mode is on.
|
||||
Optional KEYMAP is the default keymap bound to the mode keymap.
|
||||
If non-nil, it should be a variable name (whose value is a keymap),
|
||||
|
|
|
|||
|
|
@ -2640,8 +2640,7 @@ Used for the `action' property of buttons in the buffer created by
|
|||
(when (y-or-n-p (format-message "Install package `%s'? "
|
||||
(package-desc-full-name pkg-desc)))
|
||||
(package-install pkg-desc nil)
|
||||
(revert-buffer nil t)
|
||||
(goto-char (point-min)))))
|
||||
(describe-package (package-desc-name pkg-desc)))))
|
||||
|
||||
(defun package-delete-button-action (button)
|
||||
"Run `package-delete' on the package BUTTON points to.
|
||||
|
|
@ -2651,8 +2650,7 @@ Used for the `action' property of buttons in the buffer created by
|
|||
(when (y-or-n-p (format-message "Delete package `%s'? "
|
||||
(package-desc-full-name pkg-desc)))
|
||||
(package-delete pkg-desc)
|
||||
(revert-buffer nil t)
|
||||
(goto-char (point-min)))))
|
||||
(describe-package (package-desc-name pkg-desc)))))
|
||||
|
||||
(defun package-keyword-button-action (button)
|
||||
"Show filtered \"*Packages*\" buffer for BUTTON.
|
||||
|
|
|
|||
1106
lisp/emacs-lisp/shortdoc.el
Normal file
1106
lisp/emacs-lisp/shortdoc.el
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue