diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/info.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c7ac52fac32..6054ed3c213 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-04-12 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * info.el (Info-file-list-for-emacs): Add "tramp" and "dbus". | ||
| 4 | |||
| 1 | 2013-04-10 Tassilo Horn <tsdh@gnu.org> | 5 | 2013-04-10 Tassilo Horn <tsdh@gnu.org> |
| 2 | 6 | ||
| 3 | * textmodes/reftex-cite.el (reftex-parse-bibtex-entry): Don't cut | 7 | * textmodes/reftex-cite.el (reftex-parse-bibtex-entry): Don't cut |
diff --git a/lisp/info.el b/lisp/info.el index 4679b51b999..58ebf0b17da 100644 --- a/lisp/info.el +++ b/lisp/info.el | |||
| @@ -4383,7 +4383,8 @@ This feature will be removed in future.") | |||
| 4383 | ("ietf-drums" . "emacs-mime") ("quoted-printable" . "emacs-mime") | 4383 | ("ietf-drums" . "emacs-mime") ("quoted-printable" . "emacs-mime") |
| 4384 | ("binhex" . "emacs-mime") ("uudecode" . "emacs-mime") | 4384 | ("binhex" . "emacs-mime") ("uudecode" . "emacs-mime") |
| 4385 | ("mailcap" . "emacs-mime") ("mm" . "emacs-mime") | 4385 | ("mailcap" . "emacs-mime") ("mm" . "emacs-mime") |
| 4386 | ("mml" . "emacs-mime")) | 4386 | ("mml" . "emacs-mime") |
| 4387 | "tramp" "dbus") | ||
| 4387 | "List of Info files that describe Emacs commands. | 4388 | "List of Info files that describe Emacs commands. |
| 4388 | An element can be a file name, or a list of the form (PREFIX . FILE) | 4389 | An element can be a file name, or a list of the form (PREFIX . FILE) |
| 4389 | where PREFIX is a name prefix and FILE is the file to look in. | 4390 | where PREFIX is a name prefix and FILE is the file to look in. |