xemacs-beta: lisp/list-mode.el comparison

comparison lisp/list-mode.el @ 404:2f8bb876ab1d r21-2-32

Import from CVS: tag r21-2-32

author	cvs
date	Mon, 13 Aug 2007 11:16:07 +0200
parents	74fd4e045ea6
children	697ef44129c6

comparison

equal deleted inserted replaced

-:9f011ab08d48
+:2f8bb876ab1d
 ;;; list-mode.el --- Major mode for buffers containing lists of items
 ;; Copyright (C) 1992-4, 1997 Free Software Foundation, Inc.
-;; Copyright (C) 1996 Ben Wing.
+;; Copyright (C) 1996, 2000 Ben Wing.
 ;; Maintainer: XEmacs Development Team
 ;; Keywords: extensions, dumped
 ;; This file is part of XEmacs.
 (dolist (key '(kp-right right (control ?f)))
 	(define-key map key 'next-list-mode-item))
 (dolist (key '(kp-left left (control ?b)))
 	(define-key map key 'previous-list-mode-item))))
+;; #### We make list-mode-hook, as well as completion-setup-hook and
+;; minibuffer-setup-hook, permanent-local so that it's possible to create
+;; buffers in these modes and then set up some buffer-specific
+;; customizations without resorting to awful kludges.  (The problem here
+;; is that when you switch a buffer into a mode, reset-buffer is usually
+;; called, which destroys all buffer-local settings that you carefully
+;; tried to set up when you created the buffer.  Therefore, the only way
+;; to set these variables is to use the setup hooks -- but if they are
+;; not declared permanent local, then any local hook functions that you
+;; put on them (which is exactly what you want to do) also get removed,
+;; so you would have to resort to putting a global hook function on the
+;; setup hook, and then making sure it gets removed later.  I actually
+;; added some support for doing this with one-shot hooks, but this is
+;; clearly not the correct way to do things, and it fails in some cases,
+;; particularly when the buffer gets put into the mode more than once,
+;; which typically happens with completion buffers, for example.)  In
+;; fact, all setup hooks should be made permanent local, but I didn't
+;; feel like making a global change like this quite yet.  The proper way
+;; to do it would be to declare new def-style forms, such as defhook and
+;; define-local-setup-hook, which are used to initialize hooks in place
+;; of the current generic defvars. --ben
+(put 'list-mode-hook 'permanent-local t)
+(defvar list-mode-hook nil
+"Normal hook run when entering List mode.")
 (defun list-mode ()
 "Major mode for buffer containing lists of items."
 (interactive)
 (kill-all-local-variables)
 (use-local-map list-mode-map)
 (setq mode-name "List")
 (setq major-mode 'list-mode)
-(make-local-hook 'post-command-hook)
+(add-local-hook 'post-command-hook 'set-list-mode-extent)
-(add-hook 'post-command-hook 'set-list-mode-extent nil t)
+(add-local-hook 'pre-command-hook 'list-mode-extent-pre-hook)
-(make-local-hook 'pre-command-hook)
+(set (make-local-variable 'next-line-add-newlines) nil)
-(add-hook 'pre-command-hook 'list-mode-extent-pre-hook nil t)
-(make-local-variable 'next-line-add-newlines)
-(setq next-line-add-newlines nil)
 (setq list-mode-extent nil)
 ;; It is visually disconcerting to have the text cursor disappear within list
 ;; buffers, especially when moving from window to window, so leave it
 ;; visible.  -- Bob Weiner, 06/20/1999
 ; (set-specifier text-cursor-visible-p nil (current-buffer))
 (defvar completion-highlight-first-word-only nil
 "*Completion will only highlight the first blank delimited word if t.
 If the variable in not t or nil, the string is taken as a regexp to match for end
 of highlight")
+;; see comment at list-mode-hook.
+(put 'completion-setup-hook 'permanent-local t)
 (defvar completion-setup-hook nil
-"Normal hook run at the end of setting up the text of a completion buffer.")
+"Normal hook run at the end of setting up the text of a completion buffer.
+When run, the completion buffer is the current buffer.")
 ; Unnecessary FSFmacs crock.  We frob the extents directly in
 ; display-completion-list, so no "heuristics" like this are necessary.
 ;(defvar completion-fixup-function nil
 ;  "A function to customize how completions are identified in completion lists.
 :user-data
 Value passed to activation callback.
 :window-width
 If non-nil, width to use in displaying the list, instead of the
 actual window's width.
+:window-height
+If non-nil, use no more than this many lines, and extend line width as
+necessary.
 :help-string (default is the value of `completion-default-help-string')
 Form to evaluate to get a string to insert at the beginning of
 the completion list buffer.  This is evaluated when that buffer
 is the current buffer and after it has been put into
 completion-list-mode.
 ((:activate-callback 'default-choose-completion)
 :user-data
 :reference-buffer
 (:help-string completion-default-help-string)
 (:completion-string "Possible completions are:")
-:window-width)
+:window-width
+:window-height)
 ()
 (let ((old-buffer (current-buffer))
 	  (bufferp (bufferp standard-output)))
 (if bufferp
 	  (set-buffer standard-output))
 		       ;; just in case.
 		       (frame-width (or (last-nonminibuf-frame)
 					(selected-frame)))
 		     80))))
 	  (let ((count 0)
-		(max-width 0))
+		(max-width 0)
+		old-max-width)
 	    ;; Find longest completion
 	    (let ((tail completions))
 	      (while tail
 		(let* ((elt (car tail))
 		       (len (cond ((stringp elt)
 		      (setq max-width len))
 		  (setq count (1+ count)
 			tail (cdr tail)))))
 	    (setq max-width (+ 2 max-width)) ; at least two chars between cols
+	    (setq old-max-width max-width)
 	    (let ((rows (let ((cols (min (/ win-width max-width) count)))
 			  (if (<= cols 1)
 			      count
 			    (progn
 			      ;; re-space the columns
 			      (setq max-width (/ win-width cols))
 			      (if (/= (% count cols) 0) ; want ceiling...
 				  (1+ (/ count cols))
 (/ count cols)))))))
-	      (if (stringp cl-completion-string)
+	      (when
-		  (princ (gettext cl-completion-string)))
+		  (and cl-window-height
+		       (> rows cl-window-height))
+		(setq max-width old-max-width)
+		(setq rows cl-window-height))
+	      (when (and (stringp cl-completion-string)
+			 (> (length cl-completion-string) 0))
+		(princ (gettext cl-completion-string))
+		(terpri))
 	      (let ((tail completions)
 		    (r 0)
 		    (regexp-string
 		     (if (eq t
 			     completion-highlight-first-word-only)
 			 "[ \t]"
 		       completion-highlight-first-word-only)))
 		(while (< r rows)
-		  (terpri)
+		  (and (> r 0) (terpri))
 		  (let ((indent 0)
 			(column 0)
 			(tail2 tail))
 		    (while tail2
 		      (let ((elt (car tail2)))
 	  ;;		(funcall completion-fixup-function))
 	  ;;	    (put-text-property beg (point) 'mouse-face 'highlight)
 	  ;;	    (put-text-property beg (point) 'list-mode-item t)
 	  ;;	    (goto-char end)))))
 	))
-(run-hooks 'completion-setup-hook)))
+(save-excursion
+(set-buffer standard-output)
+(run-hooks 'completion-setup-hook))))
 (defvar completion-display-completion-list-function 'display-completion-list
 "Function to set up the list of completions in the completion buffer.
 The function is called with one argument, the sorted list of completions.
 Particular minibuffer interface functions (e.g. `read-file-name') may

Mercurial > hg > xemacs-beta

comparison lisp/list-mode.el @ 404:2f8bb876ab1d r21-2-32