# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1125991814 0
# Node ID df78f2fb8f6aae5f5924e87ec1bdb6aa7ae8fcaf
# Parent  a3716f7538f21ae4d072e110b4fe97918412dfd9# Parent  7e5239b21c5d45077f29c9dec2858707e1fa129f
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

diff -r a3716f7538f2 -r df78f2fb8f6a lisp/ChangeLog
--- 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
diff -r a3716f7538f2 -r df78f2fb8f6a lisp/custom.el
--- 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
diff -r a3716f7538f2 -r df78f2fb8f6a lispref/ChangeLog
--- 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
diff -r a3716f7538f2 -r df78f2fb8f6a lispref/tips.texi
--- 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