[Emacs-diffs] trunk r113274: * lisp/buff-menu.el (Buffer-menu-multi-occur): Add args and move the

[Juri Linkov]

------------------------------------------------------------
revno: 113274
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14673
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-07-04 02:11:58 +0300
message:
  * lisp/buff-menu.el (Buffer-menu-multi-occur): Add args and move the
  call of `occur-read-primary-args' to interactive spec.
  
  * lisp/ibuffer.el (ibuffer-mode-map): Bind "M-s a C-o" to
  `ibuffer-do-occur' like in buff-menu.el.
modified:
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/buff-menu.el              buffmenu.el-20091113204419-o5vbwnq5f7feedwu-197
  lisp/ibuffer.el                ibuffer.el-20091113204419-o5vbwnq5f7feedwu-2374

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-07-01 03:29:46 +0000
+++ b/etc/NEWS  2013-07-03 23:11:58 +0000
@@ -218,6 +218,10 @@
 
 *** Battery information via the BSD `apm' utility is now supported.
 
+** Buffer Menu
+
+*** `M-s a C-o' shows lines matching a regexp in marked buffers using Occur.
+
 ** Calendar and Diary
 
 +++

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-03 23:04:55 +0000
+++ b/lisp/ChangeLog    2013-07-03 23:11:58 +0000
@@ -1,3 +1,11 @@
+2013-07-03  Juri Linkov  <address@hidden>
+
+       * buff-menu.el (Buffer-menu-multi-occur): Add args and move the
+       call of `occur-read-primary-args' to interactive spec.
+
+       * ibuffer.el (ibuffer-mode-map): Bind "M-s a C-o" to
+       `ibuffer-do-occur' like in buff-menu.el.  (Bug#14673)
+
 2013-07-03  Matthias Meulien  <address@hidden>
 
        * buff-menu.el (Buffer-menu-mode-map): Bind "M-s a C-o" to

=== modified file 'lisp/buff-menu.el'
--- a/lisp/buff-menu.el 2013-07-03 23:04:55 +0000
+++ b/lisp/buff-menu.el 2013-07-03 23:11:58 +0000
@@ -482,11 +482,10 @@
   (interactive)
   (multi-isearch-buffers-regexp (Buffer-menu-marked-buffers)))
 
-(defun Buffer-menu-multi-occur ()
+(defun Buffer-menu-multi-occur (regexp &optional nlines)
   "Show all lines in marked buffers containing a match for a regexp."
-  (interactive)
-  (let ((regexp (occur-read-primary-args)))
-    (multi-occur (Buffer-menu-marked-buffers) (car regexp))))
+  (interactive (occur-read-primary-args))
+  (multi-occur (Buffer-menu-marked-buffers) regexp nlines))
 
 
 (defun Buffer-menu-visit-tags-table ()

=== modified file 'lisp/ibuffer.el'
--- a/lisp/ibuffer.el   2013-06-13 10:21:04 +0000
+++ b/lisp/ibuffer.el   2013-07-03 23:11:58 +0000
@@ -462,6 +462,7 @@
     (define-key map (kbd "M-g") 'ibuffer-jump-to-buffer)
     (define-key map (kbd "M-s a C-s") 'ibuffer-do-isearch)
     (define-key map (kbd "M-s a M-C-s") 'ibuffer-do-isearch-regexp)
+    (define-key map (kbd "M-s a C-o") 'ibuffer-do-occur)
     (define-key map (kbd "DEL") 'ibuffer-unmark-backward)
     (define-key map (kbd "M-DEL") 'ibuffer-unmark-all)
     (define-key map (kbd "* *") 'ibuffer-unmark-all)