Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
4767:dba492ef7440 4806:fd36a980d701
1777 (not 1777 (not
1778 (block custom-load 1778 (block custom-load
1779 ;; Use call-with-condition-handler so the error can be seen 1779 ;; Use call-with-condition-handler so the error can be seen
1780 ;; with the stack intact. 1780 ;; with the stack intact.
1781 (call-with-condition-handler 1781 (call-with-condition-handler
1782 #'(lambda (__custom_load_cd1__) 1782 ((macro
1783 (when (and 1783 . (lambda (lambda-expression)
1784 custom-define-current-source-file 1784 ;; Be more serious about information hiding here:
1785 (progn 1785 (nsublis
1786 (setq source (expand-file-name 1786 '((custom-load-handler-arg . #:custom-load-g9JBHiZHD))
1787 custom-define-current-source-file 1787 lambda-expression)))
1788 dir)) 1788 #'(lambda (custom-load-handler-arg)
1789 (let ((nondir (file-name-nondirectory source))) 1789 (when (and
1790 (and (file-exists-p source) 1790 custom-define-current-source-file
1791 (not (assoc source load-history)) 1791 (progn
1792 (not (assoc nondir load-history)) 1792 (setq source (expand-file-name
1793 (not (and (boundp 'preloaded-file-list) 1793 custom-define-current-source-file
1794 (member nondir 1794 dir))
1795 preloaded-file-list))))))) 1795 (let ((nondir (file-name-nondirectory source)))
1796 (if custom-warn-when-reloading-necessary 1796 (and (file-exists-p source)
1797 (lwarn 'custom-defines 'warning 1797 (not (assoc source load-history))
1798 "Error while loading custom-defines, fetching source and reloading ...\n 1798 (not (assoc nondir load-history))
1799 (not (and (boundp 'preloaded-file-list)
1800 (member nondir
1801 preloaded-file-list)))))))
1802 (if custom-warn-when-reloading-necessary
1803 (lwarn 'custom-defines 'warning
1804 "Error while loading custom-defines, fetching \
1805 source and reloading ...\n
1799 Error: %s\n 1806 Error: %s\n
1800 Source file: %s\n\n 1807 Source file: %s\n\n
1801 Backtrace follows:\n\n%s" 1808 Backtrace follows:\n\n%s"
1802 (error-message-string __custom_load_cd1__) 1809 (error-message-string custom-load-handler-arg)
1803 source 1810 source
1804 (backtrace-in-condition-handler-eliminating-handler 1811 (backtrace-in-condition-handler-eliminating-handler
1805 '__custom_load_cd1__))) 1812 'custom-load-handler-arg
1806 (return-from custom-load nil))) 1813 )))
1814 (return-from custom-load nil))))
1807 #'(lambda () 1815 #'(lambda ()
1808 (load (expand-file-name "custom-defines" dir)))))) 1816 (load (expand-file-name "custom-defines" dir))))))
1809 ;; we get here only from the `return-from'; see above 1817 ;; we get here only from the `return-from'; see above
1810 (load source)))) 1818 (load source))))
1811 1819