aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2013-08-05 14:05:46 -0400
committerStefan Monnier2013-08-05 14:05:46 -0400
commitdc6c0edad789a8aab129ae12b8f064d0e912cca7 (patch)
treec1a48c60a90799f3a05b7db15ac66bd2111bd78e /src
parent98a428c15ad48f8579b00b68aae6a89b34238b12 (diff)
downloademacs-dc6c0edad789a8aab129ae12b8f064d0e912cca7.tar.gz
emacs-dc6c0edad789a8aab129ae12b8f064d0e912cca7.zip
Revert introduction of isearch-filter-predicates.
Rely on add-function instead. * lisp/loadup.el: Preload nadvice. * lisp/isearch.el (isearch-filter-predicates): Rename it back to isearch-filter-predicate. (isearch-message-prefix): Use advice-function-mapc and advice properties to get the isearch-message-prefix. (isearch-search, isearch-lazy-highlight-search): Revert to funcall instead of run-hook-with-args-until-failure. (isearch-filter-visible): Not obsolete any more. * lisp/replace.el (perform-replace): Revert to funcall instead of run-hook-with-args-until-failure. * lisp/wdired.el (wdired-change-to-wdired-mode): Use add-function. * lisp/dired-aux.el (dired-isearch-filenames-mode): Rename from dired-isearch-filenames-toggle; make it into a proper minor mode. Use add/remove-function. (dired-isearch-filenames-setup, dired-isearch-filenames-end): Call the minor-mode rather than add/remove-hook. (dired-isearch-filter-filenames): Remove isearch-message-prefix property. * lisp/info.el (Info--search-loop): New function, extracted from Info-search. Funcall isearch-filter-predicate instead of run-hook-with-args-until-failure isearch-filter-predicates. (Info-search): Use it. (Info-mode): Use isearch-filter-predicate instead of isearch-filter-predicates. * src/lisp.mk (lisp): Add nadvice.elc. * lib-src/makefile.w32-in (lisp2): Add nadvice.elc. Fixes: debbugs:14714
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/frame.c2
-rw-r--r--src/lisp.mk1
3 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a0a31f0bf3c..35b5c1cfe5c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-08-05 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * lisp.mk (lisp): Add nadvice.elc.
4
12013-08-05 Dmitry Antipov <dmantipov@yandex.ru> 52013-08-05 Dmitry Antipov <dmantipov@yandex.ru>
2 6
3 New macro to iterate over live buffers similar to frames. 7 New macro to iterate over live buffers similar to frames.
diff --git a/src/frame.c b/src/frame.c
index 14fc15c4717..813c97ffe3e 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -710,7 +710,7 @@ affects all frames on the same terminal device. */)
710 type[SBYTES (tty_type)] = 0; 710 type[SBYTES (tty_type)] = 0;
711 } 711 }
712 712
713 t = init_tty (name, type, 0); /* Errors are not fatal. */ 713 t = init_tty (name, type, 0); /* Errors are not fatal. */
714 } 714 }
715 715
716 f = make_terminal_frame (t); 716 f = make_terminal_frame (t);
diff --git a/src/lisp.mk b/src/lisp.mk
index edd81bcf493..a9a661ea3a8 100644
--- a/src/lisp.mk
+++ b/src/lisp.mk
@@ -71,6 +71,7 @@ lisp = \
71 $(lispsource)/faces.elc \ 71 $(lispsource)/faces.elc \
72 $(lispsource)/button.elc \ 72 $(lispsource)/button.elc \
73 $(lispsource)/startup.elc \ 73 $(lispsource)/startup.elc \
74 $(lispsource)/emacs-lisp/nadvice.elc \
74 $(lispsource)/minibuffer.elc \ 75 $(lispsource)/minibuffer.elc \
75 $(lispsource)/abbrev.elc \ 76 $(lispsource)/abbrev.elc \
76 $(lispsource)/simple.elc \ 77 $(lispsource)/simple.elc \