Mercurial > hg > xemacs-beta

comparison lisp/startup.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 d71d2cefa42d
children 5efbd1253905
comparison
equal deleted inserted replaced
4767:dba492ef7440 4806:fd36a980d701
1044 (progn 1044 (progn
1045 ;; Do this without a condition-case if the user wants to debug. 1045 ;; Do this without a condition-case if the user wants to debug.
1046 (load-user-init-file)) 1046 (load-user-init-file))
1047 (condition-case nil 1047 (condition-case nil
1048 (call-with-condition-handler 1048 (call-with-condition-handler
1049 #'(lambda (__load_init_file_arg__) 1049 ((macro
1050 . (lambda (lambda-expression)
1051 ;; Be serious about information hiding here:
1052 (nsublis
1053 '((load-init-handler-arg . #:load-init-gZK6A36gTed))
1054 lambda-expression)))
1055 #'(lambda (load-init-handler-arg)
1050 (let ((errstr (error-message-string 1056 (let ((errstr (error-message-string
1051 __load_init_file_arg__))) 1057 load-init-handler-arg)))
1052 (message "Error in init file: %s" errstr) 1058 (message "Error in init file: %s" errstr)
1053 (lwarn 'initialization 'error 1059 (lwarn 'initialization 'error
1054 "\ 1060 "\
1055 An error has occurred while loading %s: 1061 An error has occurred while loading %s:
1056 1062
1064 in your initialization file and remove it. Use the `-debug-init' option 1070 in your initialization file and remove it. Use the `-debug-init' option
1065 to XEmacs to enter the debugger when the error occurs and investigate the 1071 to XEmacs to enter the debugger when the error occurs and investigate the
1066 exact problem." 1072 exact problem."
1067 user-init-file errstr 1073 user-init-file errstr
1068 (backtrace-in-condition-handler-eliminating-handler 1074 (backtrace-in-condition-handler-eliminating-handler
1069 '__load_init_file_arg__))) 1075 'load-init-handler-arg)))
1070 (setq init-file-had-error t)) 1076 (setq init-file-had-error t)))
1071 #'(lambda () 1077 #'(lambda ()
1072 (if load-user-init-file-p 1078 (if load-user-init-file-p
1073 (load-user-init-file)) 1079 (load-user-init-file))
1074 (setq init-file-had-error nil))) 1080 (setq init-file-had-error nil)))
1075 (error nil))) 1081 (error nil)))