Mercurial > emacs
changeset 90226:df78f2fb8f6a
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-80
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 531)
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 06 Sep 2005 07:30:14 +0000 |
| parents | a3716f7538f2 (current diff) 7e5239b21c5d (diff) |
| children | 10fe5fadaf89 |
| files | lisp/ChangeLog lisp/custom.el lispref/ChangeLog lispref/tips.texi |
| diffstat | 4 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Sep 06 00:25:20 2005 +0000 +++ b/lisp/ChangeLog Tue Sep 06 07:30:14 2005 +0000 @@ -1,3 +1,7 @@ +2005-09-05 Chong Yidong <cyd@stupidchicken.com> + + * custom.el (custom-push-theme): Fix last change. + 2005-09-05 Chong Yidong <cyd@stupidchicken.com> * cus-theme.el (custom-theme-write-faces): Save the current face
--- a/lisp/custom.el Tue Sep 06 00:25:20 2005 +0000 +++ b/lisp/custom.el Tue Sep 06 07:30:14 2005 +0000 @@ -649,7 +649,8 @@ (progn (setcar (cdr setting) mode) (setcar (cddr setting) value)) - (if (null old) + (if (and (null old) + (boundp symbol)) (setq old (list (list 'standard 'set
--- a/lispref/ChangeLog Tue Sep 06 00:25:20 2005 +0000 +++ b/lispref/ChangeLog Tue Sep 06 07:30:14 2005 +0000 @@ -1,3 +1,8 @@ +2005-09-06 Richard M. Stallman <rms@gnu.org> + + * tips.texi (Coding Conventions): Sometimes it is ok to put the + package prefix elsewhere than at the start of the name. + 2005-09-03 Richard M. Stallman <rms@gnu.org> * tips.texi (Programming Tips): Add conventions for minibuffer
--- a/lispref/tips.texi Tue Sep 06 00:25:20 2005 +0000 +++ b/lispref/tips.texi Tue Sep 06 07:30:14 2005 +0000 @@ -56,7 +56,9 @@ benefits of a Common Lisp-style package system are considered not to outweigh the costs.} Then take care to begin the names of all global variables, constants, and functions in your program with the chosen -prefix. This helps avoid name conflicts. +prefix. This helps avoid name conflicts. (Occasionally, for a command +name intended for users to use, it is cleaner if some words come +before the package name prefix.) This recommendation applies even to names for traditional Lisp primitives that are not primitives in Emacs Lisp---such as