xemacs-beta: lisp/minibuf.el comparison

comparison lisp/minibuf.el @ 4806:fd36a980d701

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	74a5eaa67982
children	668c73e222fd

comparison

equal deleted inserted replaced

-:dba492ef7440
+:fd36a980d701
 		 integer)
 :group 'minibuffer)
 (define-error 'input-error "Keyboard input error" 'io-error)
-(defun read-from-minibuffer (prompt &optional initial-contents
+((macro
-keymap
+. (lambda (read-from-minibuffer-definition)
-readp
+(nsublis
-history
+;; `M-x doctor' makes (the interned) history a local variable, use an
-				    abbrev-table
+;; uninterned symbol here so we don't interact with it.
-				    default)
+'((history . #:history))
-"Read a string from the minibuffer, prompting with string PROMPT.
+read-from-minibuffer-definition)))
+(defun read-from-minibuffer (prompt &optional initial-contents keymap
+			      readp history abbrev-table default)
+"Read a string from the minibuffer, prompting with string PROMPT.
 If optional second arg INITIAL-CONTENTS is non-nil, it is a string
 to be inserted into the minibuffer before reading input.
 If INITIAL-CONTENTS is (STRING . POSITION), the initial input
 is STRING, but point is placed POSITION characters into the string.
 Third arg KEYMAP is a keymap to use while reading;
 Seventh arg DEFAULT, if non-nil, will be returned when user enters
 an empty string.
 See also the variable `completion-highlight-first-word-only' for
 control over completion display."
 (if (and (not enable-recursive-minibuffers)
-(> (minibuffer-depth) 0)
+	    (> (minibuffer-depth) 0)
-(eq (selected-window) (minibuffer-window)))
+	    (eq (selected-window) (minibuffer-window)))
 (error "Command attempted to use minibuffer while in minibuffer"))
 (if (and minibuffer-max-depth
-	   (> minibuffer-max-depth 0)
+	    (> minibuffer-max-depth 0)
-(>= (minibuffer-depth) minibuffer-max-depth))
+	    (>= (minibuffer-depth) minibuffer-max-depth))
 (minibuffer-max-depth-exceeded))
 ;; catch this error before the poor user has typed something...
 (if history
 (if (symbolp history)
-	  (or (boundp history)
+	   (or (boundp history)
-	      (error "History list %S is unbound" history))
+	       (error "History list %S is unbound" history))
-	(or (boundp (car history))
+	 (or (boundp (car history))
-	    (error "History list %S is unbound" (car history)))))
+	     (error "History list %S is unbound" (car history)))))
 (if (noninteractive)
 (progn
-;; XEmacs in -batch mode calls minibuffer: print the prompt.
+	 ;; XEmacs in -batch mode calls minibuffer: print the prompt.
-(message "%s" (gettext prompt))
+	 (message "%s" (gettext prompt))
-;;#### force-output
+	 ;;#### force-output
-;;#### Should this even be falling though to the code below?
+	 ;;#### Should this even be falling though to the code below?
-;;#### How does this stuff work now, anyway?
+	 ;;#### How does this stuff work now, anyway?
-))
+	 ))
 (let* ((dir default-directory)
-(owindow (selected-window))
+	  (owindow (selected-window))
-	 (oframe (selected-frame))
+	  (oframe (selected-frame))
-(window (minibuffer-window))
+	  (window (minibuffer-window))
-(buffer (get-buffer-create (format " *Minibuf-%d*"
+	  (buffer (get-buffer-create (format " *Minibuf-%d*"
-					    (minibuffer-depth))))
+					     (minibuffer-depth))))
-(frame (window-frame window))
+	  (frame (window-frame window))
-(mconfig (if (eq frame (selected-frame))
+	  (mconfig (if (eq frame (selected-frame))
-nil (current-window-configuration frame)))
+		       nil (current-window-configuration frame)))
-(oconfig (current-window-configuration))
+	  (oconfig (current-window-configuration))
-	 ;; dynamic scope sucks sucks sucks sucks sucks sucks.
+	  (minibuffer-default default))
-	 ;; `M-x doctor' makes history a local variable, and thus
+(unwind-protect
-	 ;; our binding above is buffer-local and doesn't apply
-	 ;; once we switch buffers!!!!  We demand better scope!
-	 (_history_ history)
-	 (minibuffer-default default))
-(unwind-protect
 (progn
 (set-buffer (reset-buffer buffer))
 (setq default-directory dir)
 (make-local-variable 'print-escape-newlines)
 (setq print-escape-newlines t)
 (let ((mouse-grabbed-buffer
 		  (and minibuffer-smart-completion-tracking-behavior
 		       (current-buffer)))
 (current-prefix-arg current-prefix-arg)
 ;;                 (help-form minibuffer-help-form)
-(minibuffer-history-variable (cond ((not _history_)
+(minibuffer-history-variable (cond ((not history)
 'minibuffer-history)
-((consp _history_)
+((consp history)
-(car _history_))
+(car history))
 (t
-_history_)))
+history)))
-(minibuffer-history-position (cond ((consp _history_)
+(minibuffer-history-position (cond ((consp history)
-(cdr _history_))
+(cdr history))
 (t
 0)))
 (minibuffer-scroll-window owindow))
 	     (setq initial-minibuffer-history-position
 		   minibuffer-history-position)
 	     (if abbrev-table
 		 (setq local-abbrev-table abbrev-table
 		       abbrev-mode t))
 	     ;; This is now run from read-minibuffer-internal
-;(if minibuffer-setup-hook
+					;(if minibuffer-setup-hook
-;    (run-hooks 'minibuffer-setup-hook))
+					;    (run-hooks 'minibuffer-setup-hook))
-;(message nil)
+					;(message nil)
 (if (eq 't
 (catch 'exit
 (if (> (recursion-depth) (minibuffer-depth))
 (let ((standard-output t)
 (standard-input t))
 (read-minibuffer-internal prompt))
-(read-minibuffer-internal prompt))))
+			 (read-minibuffer-internal prompt))))
 ;; Translate an "abort" (throw 'exit 't)
 ;;  into a real quit
 (signal 'quit '())
 ;; return value
 (let* ((val (progn (set-buffer buffer)
 				(if minibuffer-history-uniquify
 				    (cons histval (remove histval list))
 				  (cons histval list))))))
 (if err (signal (car err) (cdr err)))
 val))))
 ;; stupid display code requires this for some reason
 (set-buffer buffer)
 (buffer-disable-undo buffer)
 (setq buffer-read-only nil)
 (erase-buffer)
 ;; restore frame configurations
 (if (and mconfig (frame-live-p oframe)
-	       (eq frame (selected-frame)))
+		(eq frame (selected-frame)))
-	  ;; if we changed frames (due to surrogate minibuffer),
+	   ;; if we changed frames (due to surrogate minibuffer),
-	  ;; and we're still on the new frame, go back to the old one.
+	   ;; and we're still on the new frame, go back to the old one.
-	  (select-frame oframe))
+	   (select-frame oframe))
 (if mconfig (set-window-configuration mconfig))
-(set-window-configuration oconfig))))
+(set-window-configuration oconfig)))))
 (defun minibuffer-max-depth-exceeded ()
 ;;
 ;; This signals an error if an Nth minibuffer is invoked while N-1 are
 ;; already active, whether the minibuffer window is selected or not.

Mercurial > hg > xemacs-beta

comparison lisp/minibuf.el @ 4806:fd36a980d701