diff options
| author | Juri Linkov <juri@jurta.org> | 2008-03-12 21:55:02 +0000 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2008-03-12 21:55:02 +0000 |
| commit | de5ab37dc957b7fcd7031dc1a9f5d16e27279512 (patch) | |
| tree | c22ba2b229c7884842d938264630d7fab8d09e0b | |
| parent | 9bc6f805fcc851b23e0ee6c9946887f0ae6085d7 (diff) | |
(describe-project): Remove defaliases for view-todo and
describe-project that are now unnecessary after the merge from
emacs--rel--22 that added define-obsolete-function-alias.
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/help.el | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b6b4f8df0da..eded98568e4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2008-03-12 Juri Linkov <juri@jurta.org> + + * help.el (describe-project): Remove defaliases for view-todo and + describe-project that are now unnecessary after the merge from + emacs--rel--22 that added define-obsolete-function-alias. + + * startup.el (inhibit-startup-screen): Revert incomplete + 2008-03-10 merge from emacs--rel--22 that partly reverted + 2008-02-28 change that added initial message to *scratch* buffer + regardless of the value of `inhibit-startup-screen'. + Now keep this change in the trunk, but not in the 22 branch. + 2008-03-12 Stefan Monnier <monnier@iro.umontreal.ca> * international/quail.el (quail-setup-completion-buf, quail-help): diff --git a/lisp/help.el b/lisp/help.el index a698e87950b..85470d807de 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -309,7 +309,6 @@ If that doesn't give a function, return nil." (interactive) (view-help-file "COPYING")) -(defalias 'describe-project 'describe-gnu-project) (defun describe-gnu-project () "Display info on the GNU project." (interactive) @@ -414,7 +413,6 @@ With argument, display info only for the selected version." (beginning-of-line) (point))))))) -(defalias 'view-todo 'view-emacs-todo) (defun view-emacs-todo (&optional arg) "Display the Emacs TODO list." (interactive "P") |