Anonymous avatar Anonymous committed 6c29e7f

2002-04-30 John Paul Wallington <jpw@xemacs.org>;

* ibuffer.el (ibuffer-insert-filter-group): Change help-echo.
(toplevel): define-ibuffer-column name: Ditto.

2002-04-29 Colin Walters <walters@verbum.org>;

* ibuf-ext.el (ibuffer-kill-line): Copy the filter group data
structure when killing.
(ibuffer-yank): Handle case where we're yanking on the default
group correctly.
(ibuffer-delete-saved-filter-groups): Doc fix.

Comments (0)

Files changed (3)

+2002-04-30  John Paul Wallington  <jpw@xemacs.org>
+
+	* ibuffer.el (ibuffer-insert-filter-group): Change help-echo.
+	(toplevel): define-ibuffer-column name: Ditto.
+
+2002-04-29  Colin Walters  <walters@verbum.org>
+
+	* ibuf-ext.el (ibuffer-kill-line): Copy the filter group data 
+	structure when killing.
+	(ibuffer-yank): Handle case where we're yanking on the default
+	group correctly.
+	(ibuffer-delete-saved-filter-groups): Doc fix.
+	
 2002-04-30  Steve Youngs  <youngs@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.06 released.
       (progn
 	(when (equal it "Default")
 	  (error "Can't kill default filtering group"))
-	(push (assoc it ibuffer-filter-groups) ibuffer-filter-group-kill-ring)
+	(push (copy-tree (assoc it ibuffer-filter-groups))
+	      ibuffer-filter-group-kill-ring)
 	(ibuffer-kill-filter-group it))
       (funcall (if (interactive-p) #'call-interactively #'funcall)
 	       #'kill-line arg)))
 		    (get-text-property (point) 'ibuffer-filter-group)
 		    (last all-groups)))
 	   (pos (or (position cur (mapcar #'car all-groups) :test #'equal)
-		    (1- (length all-groups)))))
+		    (length all-groups))))
       (cond ((= pos 0)
 	     (push last-killed ibuffer-filter-groups))
-	    ((= pos (1- (length all-groups)))
+	    ((= pos (length all-groups))
 	     (setq ibuffer-filter-groups
 		   (nconc ibuffer-filter-groups (list last-killed))))
 	    (t
    (list
     (if (null ibuffer-saved-filter-groups)
 	(error "No saved filters")
-      (completing-read "Delete saved filters: "
+      (completing-read "Delete saved filter group: "
 		       ibuffer-saved-filter-groups nil t))))
   (setq ibuffer-saved-filter-groups
 	(ibuffer-delete-alist name ibuffer-saved-filter-groups))
 			     ('mouse-face 'highlight 
 			      'keymap ibuffer-name-map
 	                      'ibuffer-name-column t
- 			      'help-echo "button1: mark   button2: select   button3: operate"))
+ 			      'help-echo "button1: mark   button2: select   button3: Operate menu"))
   (buffer-name))
   
 (define-ibuffer-column size (:inline t)
 	  (nreverse result)
 	result))))
 
-; (defun ibuffer-insert-filter-group (name display-name format bmarklist)
-;   (add-text-properties
-;    (point)
-;    (progn
-;      (insert "[ " display-name " ]")
-;      (point))
-;    `(ibuffer-filter-group-name ,name keymap ,ibuffer-mode-filter-group-map
-; 			       mouse-face highlight
-; 			       help-echo "button1: toggle marks in this group\nmouse-2: hide/show this filtering group "))
-;   (insert "\n")
-;   (when bmarklist
-;     (put-text-property
-;      (point)
-;      (progn
-;        (dolist (entry bmarklist)
-; 	 (ibuffer-insert-buffer-line (car entry) (cdr entry) format))
-;        (point))
-;      'ibuffer-filter-group
-;      name)))
-
 (defun ibuffer-insert-filter-group (name display-name format bmarklist)
   (insert (ibuffer-propertize (concat "[ " display-name " ]")
 			      'ibuffer-filter-group-name name
 			      'keymap ibuffer-mode-filter-group-map
 			      'mouse-face 'highlight
-			      'help-echo "button1: toggle marks in this group\nmouse-2: hide/show this filtering group ")
+			      'help-echo "button1: toggle marks   button2: hide/show   button3: Filter Groups menu")
 	  "\n")
   (when bmarklist
     (put-text-property
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.