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

4 files changed, 14 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c515f9accc7..a0256150af9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 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
         spec, not the defface spec.
 
diff --git a/lisp/custom.el b/lisp/custom.el
index 2b714a7b458..d634160e534 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -649,7 +649,8 @@ See `custom-known-themes' for a list of known themes."
         (progn
           (setcar (cdr setting) mode)
           (setcar (cddr setting) value))
-      (if (null old)
+      (if (and (null old)
+               (boundp symbol))
           (setq old
                 (list
                  (list 'standard 'set
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index ec8885138b5..8fc5754bf80 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -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
diff --git a/lispref/tips.texi b/lispref/tips.texi
index d651eb95f0e..fbf18047bde 100644
--- a/lispref/tips.texi
+++ b/lispref/tips.texi
@@ -56,7 +56,9 @@ distinguish your program from other Lisp programs.@footnote{The
 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