Mercurial > hg > xemacs-beta

diff lisp/cus-edit.el @ 4806:fd36a980d701

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use uninterned symbols in various information-hiding contexts. lisp/ChangeLog addition: 2010-01-01 Aidan Kehoe <kehoea@parhasard.net> * syntax.el (map-syntax-table): * subr.el (map-plist): * startup.el (load-init-file): * minibuf.el (read-from-minbuffer): * cus-edit.el (custom-load-custom-defines-1): * cmdloop.el (execute-extended-command): Replace symbol names using underscore, whether to avoid dynamic scope problems or to ensure helpful arguments to #'call-with-condition-handler, with uninterned symbols. src/ChangeLog addition: 2010-01-01 Aidan Kehoe <kehoea@parhasard.net> * mule-charset.c (Fmake_charset): Don't intern the symbols used to refer to temporary character sets, that doesn't bring us anything.
author Aidan Kehoe <kehoea@parhasard.net>
date Fri, 01 Jan 2010 19:45:39 +0000
parents 17f7e9191c0b
children f00192e1cd49 308d34e9f07d
line wrap: on
line diff
--- a/lisp/cus-edit.el	Sat Dec 05 01:04:17 2009 +0900
+++ b/lisp/cus-edit.el	Fri Jan 01 19:45:39 2010 +0000
@@ -1779,31 +1779,39 @@
 	   ;; Use call-with-condition-handler so the error can be seen
 	   ;; with the stack intact.
 	   (call-with-condition-handler
-	       #'(lambda (__custom_load_cd1__)
-		   (when (and
-			  custom-define-current-source-file
-			  (progn
-			    (setq source (expand-file-name
-					  custom-define-current-source-file
-					  dir))
-			    (let ((nondir (file-name-nondirectory source)))
-			      (and (file-exists-p source)
-				   (not (assoc source load-history))
-				   (not (assoc nondir load-history))
-				   (not (and (boundp 'preloaded-file-list)
-					     (member nondir
-						     preloaded-file-list)))))))
-		     (if custom-warn-when-reloading-necessary
-			 (lwarn 'custom-defines 'warning
-			   "Error while loading custom-defines, fetching source and reloading ...\n
+	       ((macro
+		 . (lambda (lambda-expression)
+		     ;; Be more serious about information hiding here:
+		     (nsublis
+		      '((custom-load-handler-arg . #:custom-load-g9JBHiZHD))
+		      lambda-expression)))
+		#'(lambda (custom-load-handler-arg)
+		    (when (and
+			   custom-define-current-source-file
+			   (progn
+			     (setq source (expand-file-name
+					   custom-define-current-source-file
+					   dir))
+			     (let ((nondir (file-name-nondirectory source)))
+			       (and (file-exists-p source)
+				    (not (assoc source load-history))
+				    (not (assoc nondir load-history))
+				    (not (and (boundp 'preloaded-file-list)
+					      (member nondir
+						      preloaded-file-list)))))))
+		      (if custom-warn-when-reloading-necessary
+			  (lwarn 'custom-defines 'warning
+			    "Error while loading custom-defines, fetching \
+source and reloading ...\n
 Error: %s\n
 Source file: %s\n\n
 Backtrace follows:\n\n%s"
-			   (error-message-string __custom_load_cd1__)
-			   source
-			   (backtrace-in-condition-handler-eliminating-handler
-			    '__custom_load_cd1__)))
-		     (return-from custom-load nil)))
+			    (error-message-string custom-load-handler-arg)
+			    source
+			    (backtrace-in-condition-handler-eliminating-handler
+			     'custom-load-handler-arg
+)))
+		      (return-from custom-load nil))))
 	       #'(lambda ()
 		   (load (expand-file-name "custom-defines" dir))))))
       ;; we get here only from the `return-from'; see above