Mercurial > hg > xemacs-beta
annotate lisp/mode-motion.el @ 5882:bbe4146603db
Reduce regexp usage, now CL-oriented non-regexp code available, core Lisp
lisp/ChangeLog addition:
2015-04-01 Aidan Kehoe <kehoea@parhasard.net>
When calling #'string-match with a REGEXP without regular
expression special characters, call #'search, #'mismatch, #'find,
etc. instead, making our code less likely to side-effect other
functions' match data and a little faster.
* apropos.el (apropos-command):
* apropos.el (apropos):
Call (position ?\n ...) rather than (string-match "\n" ...) here.
* buff-menu.el:
* buff-menu.el (buffers-menu-omit-invisible-buffers):
Don't fire up the regexp engine just to check if a string starts
with a space.
* buff-menu.el (select-buffers-tab-buffers-by-mode):
Don't fire up the regexp engine just to compare mode basenames.
* buff-menu.el (format-buffers-tab-line):
* buff-menu.el (build-buffers-tab-internal): Moved to being a
label within the following.
* buff-menu.el (buffers-tab-items): Use the label.
* bytecomp.el (byte-compile-log-1):
Don't fire up the regexp engine just to look for a newline.
* cus-edit.el (get):
Ditto.
* cus-edit.el (custom-variable-value-create):
Ditto, but for a colon.
* descr-text.el (describe-text-sexp):
Ditto.
* descr-text.el (describe-char-unicode-data):
Use #'split-string-by-char given that we're just looking for a
semicolon.
* descr-text.el (describe-char):
Don't fire up the regexp engine just to look for a newline.
* disass.el (disassemble-internal):
Ditto.
* files.el (file-name-sans-extension):
Implement this using #'position.
* files.el (file-name-extension):
Correct this function's docstring, implement it in terms of
#'position.
* files.el (insert-directory):
Don't fire up the regexp engine to split a string by space; don't
reverse the list of switches, this is actually a longstand bug as
far as I can see.
* gnuserv.el (gnuserv-process-filter):
Use #'position here, instead of consing inside #'split-string
needlessly.
* gtk-file-dialog.el (gtk-file-dialog-update-dropdown):
Use #'split-string-by-char here, don't fire up #'split-string for
directory-sep-char.
* gtk-font-menu.el (hack-font-truename):
Implement this more cheaply in terms of #'find,
#'split-string-by-char, #'equal, rather than #'string-match,
#'split-string, #'string-equal.
* hyper-apropos.el (hyper-apropos-grok-functions):
* hyper-apropos.el (hyper-apropos-grok-variables):
Look for a newline using #'position rather than #'string-match in
these functions.
* info.el (Info-insert-dir):
* info.el (Info-insert-file-contents):
* info.el (Info-follow-reference):
* info.el (Info-extract-menu-node-name):
* info.el (Info-menu):
Look for fixed strings using #'position or #'search as appropriate
in this file.
* ldap.el (ldap-decode-string):
* ldap.el (ldap-encode-string):
#'encode-coding-string, #'decode-coding-string are always
available, don't check if they're fboundp.
* ldap.el (ldap-decode-address):
* ldap.el (ldap-encode-address):
Use #'split-string-by-char in these functions.
* lisp-mnt.el (lm-creation-date):
* lisp-mnt.el (lm-last-modified-date):
Don't fire up the regexp engine just to look for spaces in this file.
* menubar-items.el (default-menubar):
Use (not (mismatch ...)) rather than #'string-match here, for
simple regexp.
Use (search "beta" ...) rather than (string-match "beta" ...)
* menubar-items.el (sort-buffers-menu-alphabetically):
* menubar-items.el (sort-buffers-menu-by-mode-then-alphabetically):
* menubar-items.el (group-buffers-menu-by-mode-then-alphabetically):
Don't fire up the regexp engine to check if a string starts with
a space or an asterisk.
Use the more fine-grained results of #'compare-strings; compare
case-insensitively for the buffer menu.
* menubar-items.el (list-all-buffers):
* menubar-items.el (tutorials-menu-filter):
Use #'equal rather than #'string-equal, which, in this context,
has the drawback of not having a bytecode, and no redeeming
features.
* minibuf.el:
* minibuf.el (un-substitute-in-file-name):
Use #'count, rather than counting the occurences of $ using the
regexp engine.
* minibuf.el (read-file-name-internal-1):
Don't fire up the regexp engine to search for ?=.
* mouse.el (mouse-eval-sexp):
Check for newline with #'find.
* msw-font-menu.el (mswindows-reset-device-font-menus):
Split a string by newline with #'split-string-by-char.
* mule/japanese.el:
* mule/japanese.el ("Japanese"):
Use #'search rather than #'string-match; canoncase before
comparing; fix a bug I had introduced where I had been making case
insensitive comparisons where the case mattered.
* mule/korea-util.el (default-korean-keyboard):
Look for ?3 using #'find, not #'string-march.
* mule/korea-util.el (quail-hangul-switch-hanja):
Search for a fixed string using #'search.
* mule/mule-cmds.el (set-locale-for-language-environment):
#'position, #'substitute rather than #'string-match,
#'replace-in-string.
* newcomment.el (comment-make-extra-lines):
Use #'search rather than #'string-match for a simple string.
* package-get.el (package-get-remote-filename):
Use #'position when looking for ?@
* process.el (setenv):
* process.el (read-envvar-name):
Use #'position when looking for ?=.
* replace.el (map-query-replace-regexp):
Use #'split-string-by-char instead of using an inline
implementation of it.
* select.el (select-convert-from-cf-text):
* select.el (select-convert-from-cf-unicodetext):
Use #'position rather than #'string-match in these functions.
* setup-paths.el (paths-emacs-data-root-p):
Use #'search when looking for simple string.
* sound.el (load-sound-file):
Use #'split-string-by-char rather than an inline reimplementation
of same.
* startup.el (splash-screen-window-body):
* startup.el (splash-screen-tty-body):
Search for simple strings using #'search.
* version.el (emacs-version):
Ditto.
* x-font-menu.el (hack-font-truename):
Implement this more cheaply in terms of #'find,
#'split-string-by-char, #'equal, rather than #'string-match,
#'split-string, #'string-equal.
* x-font-menu.el (x-reset-device-font-menus-core):
Use #'split-string-by-char here.
* x-init.el (x-initialize-keyboard):
Search for a simple string using #'search.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 01 Apr 2015 14:28:20 +0100 |
parents | 308d34e9f07d |
children |
rev | line source |
---|---|
428 | 1 ;;; mode-motion.el --- Mode-specific mouse-highlighting of text. |
2 | |
3 ;; Copyright (C) 1992, 1993, 1997 Free Software Foundation, Inc. | |
4 | |
5 ;; Maintainer: XEmacs Development Team | |
6 ;; Keywords: internal, mouse, dumped | |
7 | |
8 ;; This file is part of XEmacs. | |
9 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
428
diff
changeset
|
10 ;; XEmacs is free software: you can redistribute it and/or modify it |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
428
diff
changeset
|
11 ;; under the terms of the GNU General Public License as published by the |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
428
diff
changeset
|
12 ;; Free Software Foundation, either version 3 of the License, or (at your |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
428
diff
changeset
|
13 ;; option) any later version. |
428 | 14 |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
428
diff
changeset
|
15 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
428
diff
changeset
|
16 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
428
diff
changeset
|
17 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
428
diff
changeset
|
18 ;; for more details. |
428 | 19 |
20 ;; You should have received a copy of the GNU General Public License | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
428
diff
changeset
|
21 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
428 | 22 |
23 ;;; Synched up with: Not in FSF. | |
24 | |
25 ;;; Commentary: | |
26 | |
27 ;; This file is dumped with XEmacs (when window system support is compiled in). | |
28 | |
29 ;;; Code: | |
30 | |
31 (defvar mode-motion-hook nil | |
32 "Function or functions which are called whenever the mouse moves. | |
33 Each function must take a single argument of the motion event. | |
34 You should normally use this rather than `mouse-motion-handler', which | |
35 does some additional window-system-dependent things. This hook is local | |
36 to every buffer, and should normally be set up by major-modes which want | |
37 to use special highlighting. Every time the mouse moves over a window, | |
38 the mode-motion-hook of the buffer of that window is run.") | |
39 | |
40 (make-variable-buffer-local 'mode-motion-hook) | |
41 | |
42 (defvar mode-motion-extent nil) | |
43 (make-variable-buffer-local 'mode-motion-extent) | |
44 | |
45 (defvar mode-motion-help-echo-string nil | |
46 "String to be added as the 'help-echo property of the mode-motion extent. | |
47 In order for this to work, you need to add the hook function | |
48 `mode-motion-add-help-echo' to the mode-motion hook. If this is a function, | |
49 it will be called with one argument (the event) and should return a string | |
50 to be added. This variable is local to every buffer.") | |
51 (make-variable-buffer-local 'mode-motion-help-echo-string) | |
52 | |
53 (defun mode-motion-ensure-extent-ok (event) | |
54 (let ((buffer (event-buffer event))) | |
55 (if (and (extent-live-p mode-motion-extent) | |
56 (eq buffer (extent-object mode-motion-extent))) | |
57 nil | |
58 (setq mode-motion-extent (make-extent nil nil buffer)) | |
59 (set-extent-property mode-motion-extent 'mouse-face 'highlight)))) | |
60 | |
61 (defun mode-motion-highlight-internal (event backward forward) | |
62 (let* ((buffer (event-buffer event)) | |
63 (point (and buffer (event-point event)))) | |
64 (if (and buffer | |
65 (not (eq buffer mouse-grabbed-buffer))) | |
66 ;; #### ack!! Too many calls to save-window-excursion / | |
67 ;; save-excursion (x-track-pointer calls, so does | |
68 ;; minibuf-mouse-tracker ...) This needs to be looked | |
69 ;; into. It's complicated by the fact that sometimes | |
70 ;; a mode-motion-hook might really want to change | |
71 ;; the point. | |
72 ;; | |
73 ;; #### The save-excursion must come before the | |
74 ;; save-window-excursion in order to function properly. I | |
75 ;; haven't given this much thought. Is it a bug that this | |
76 ;; ordering is necessary or is it correct behavior? | |
77 (save-excursion | |
78 (save-window-excursion | |
79 (set-buffer buffer) | |
80 (mode-motion-ensure-extent-ok event) | |
81 (if point | |
82 ;; Use save-excursion here to avoid | |
83 ;; save-window-excursion seeing a change in | |
84 ;; window point's value which would make the | |
85 ;; display code do a whole lot of useless work | |
86 ;; and making the display flicker horribly. | |
87 (save-excursion | |
88 (goto-char point) | |
89 (condition-case nil (funcall backward) (error nil)) | |
90 (setq point (point)) | |
91 (condition-case nil (funcall forward) (error nil)) | |
92 (if (eq point (point)) | |
93 (detach-extent mode-motion-extent) | |
94 (set-extent-endpoints mode-motion-extent point (point)))) | |
95 ;; not over text; zero the extent. | |
96 (detach-extent mode-motion-extent))))))) | |
97 | |
98 (defun mode-motion-highlight-line (event) | |
99 "For use as the value of `mode-motion-hook' -- highlight line under mouse." | |
100 (mode-motion-highlight-internal event 'beginning-of-line 'end-of-line)) | |
101 | |
102 (defun mode-motion-highlight-word (event) | |
103 "For use as the value of `mode-motion-hook' -- highlight word under mouse." | |
104 (mode-motion-highlight-internal | |
105 event | |
106 #'(lambda () (default-mouse-track-beginning-of-word nil)) | |
107 #'(lambda () (default-mouse-track-end-of-word nil)))) | |
108 | |
109 (defun mode-motion-highlight-symbol (event) | |
110 "For use as the value of `mode-motion-hook' -- highlight symbol under mouse." | |
111 (mode-motion-highlight-internal | |
112 event | |
113 #'(lambda () (default-mouse-track-beginning-of-word t)) | |
114 #'(lambda () (default-mouse-track-end-of-word t)))) | |
115 | |
116 (defun mode-motion-highlight-sexp (event) | |
117 "For use as the value of `mode-motion-hook' -- highlight form under mouse." | |
118 (mode-motion-highlight-internal | |
119 event | |
120 #'(lambda () | |
121 (if (= (char-syntax (following-char)) ?\() | |
122 nil | |
123 (goto-char (scan-sexps (point) -1)))) | |
124 #'(lambda () | |
125 (if (= (char-syntax (following-char)) ?\)) | |
126 (forward-char 1)) | |
127 (goto-char (scan-sexps (point) 1))))) | |
128 | |
129 (defun mode-motion-add-help-echo (event) | |
130 "For use as the value of `mode-motion-hook' -- add a 'help-echo property. | |
131 This causes the string in the 'help-echo property to be displayed when the | |
132 mouse moves over the extent. See `mode-motion-help-echo-string' for | |
133 documentation on how to control the string that is added." | |
134 (mode-motion-ensure-extent-ok event) | |
135 (let ((string (cond ((null mode-motion-help-echo-string) nil) | |
136 ((stringp mode-motion-help-echo-string) | |
137 mode-motion-help-echo-string) | |
138 (t (funcall mode-motion-help-echo-string event))))) | |
139 (if (stringp string) | |
140 (set-extent-property mode-motion-extent 'help-echo string)))) | |
141 | |
142 | |
143 (provide 'mode-motion) | |
144 | |
145 ;;; mode-motion.el ends here |