Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-305
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-306
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-307
   Update from CVS: lispref/display.texi (Forcing Redisplay): Fix typo.

 * emacs@sv.gnu.org/emacs--devo--0--patch-308
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-309
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-310
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-311
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-312
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-313
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-314
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-315
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-316
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-317
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-318
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-319
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-320
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-321
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-322
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-323
   lisp/play/cookie1.el (cookie): Work properly when there's only one entry

 * emacs@sv.gnu.org/emacs--devo--0--patch-324
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-325
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-326
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-327
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-328
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-329
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-330
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-105
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-106
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-107
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-108
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-109
   Clean up merge mistakes

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-110
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-571

1 files changed, 21 insertions, 7 deletions

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 52f66038ea6..d7ffab4bc5b 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -587,6 +587,7 @@ WIDGET is the widget to apply the filter entries of MENU on."
 
 (defcustom custom-guess-name-alist
   '(("-p\\'" boolean)
+    ("-flag\\'" boolean)
     ("-hook\\'" hook)
     ("-face\\'" face)
     ("-file\\'" file)
@@ -1054,6 +1055,8 @@ then prompt for the MODE to customize."
 (defun customize-option (symbol)
   "Customize SYMBOL, which must be a user option variable."
   (interactive (custom-variable-prompt))
+  (unless symbol
+    (error "No variable specified"))
   (let ((basevar (indirect-variable symbol)))
     (custom-buffer-create (list (list basevar 'custom-variable))
 			  (format "*Customize Option: %s*"
@@ -1069,6 +1072,8 @@ then prompt for the MODE to customize."
   "Customize SYMBOL, which must be a user option variable.
 Show the buffer in another window, but don't select it."
   (interactive (custom-variable-prompt))
+  (unless symbol
+    (error "No variable specified"))
   (let ((basevar (indirect-variable symbol)))
     (custom-buffer-create-other-window
      (list (list basevar 'custom-variable))
@@ -1361,10 +1366,10 @@ that are not customizable options, as well as faces and groups
 				      (get symbol 'variable-documentation))))
 		    (push (list symbol 'custom-variable) found)))))
     (if (not found)
-	(error "No matches")
-      (custom-buffer-create (custom-sort-items found t
-					       custom-buffer-order-groups)
-			    "*Customize Apropos*"))))
+	(error "No customizable items matching %s" regexp)
+      (custom-buffer-create
+       (custom-sort-items found t custom-buffer-order-groups)
+       "*Customize Apropos*"))))
 
 ;;;###autoload
 (defun customize-apropos-options (regexp &optional arg)
@@ -4515,9 +4520,18 @@ if that value is non-nil."
 
 (put 'custom-mode 'mode-class 'special)
 
-(add-to-list
- 'debug-ignored-errors
- "^No user options have changed defaults in recent Emacs versions$")
+(dolist (regexp
+	 '("^No user option defaults have been changed since Emacs "
+	   "^Invalid face:? "
+	   "^No \\(?:customized\\|rogue\\|saved\\) user options"
+	   "^No customizable items matching "
+	   "^There are unset changes"
+	   "^Cannot set hidden variable"
+	   "^No \\(?:saved\\|backup\\) value for "
+	   "^No standard setting known for "
+	   "^No standard setting for this face"
+	   "^Saving settings from \"emacs -q\" would overwrite existing customizations"))
+  (add-to-list 'debug-ignored-errors regexp))
 
 ;;; The End.