Mercurial > hg > xemacs-beta
annotate lisp/x-misc.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 | 6506fcb40fcf |
children |
rev | line source |
---|---|
428 | 1 ;;; x-misc.el --- miscellaneous X functions. |
2 | |
3 ;; Copyright (C) 1997 Free Software Foundation, Inc. | |
4 ;; Copyright (C) 1995 Sun Microsystems. | |
5 ;; Copyright (C) 1995, 1996 Ben Wing. | |
6 | |
7 ;; Author: Ben Wing <ben@xemacs.org> | |
8 ;; Maintainer: XEmacs Development Team | |
9 ;; Keywords: extensions, dumped | |
10 | |
11 ;; This file is part of XEmacs. | |
12 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4783
diff
changeset
|
13 ;; 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:
4783
diff
changeset
|
14 ;; 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:
4783
diff
changeset
|
15 ;; 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:
4783
diff
changeset
|
16 ;; option) any later version. |
428 | 17 |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4783
diff
changeset
|
18 ;; 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:
4783
diff
changeset
|
19 ;; 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:
4783
diff
changeset
|
20 ;; 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:
4783
diff
changeset
|
21 ;; for more details. |
428 | 22 |
23 ;; 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:
4783
diff
changeset
|
24 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
428 | 25 |
26 ;;; Commentary: | |
27 | |
28 ;; This file is dumped with XEmacs (when X support is compiled in). | |
29 | |
30 ;;; Code: | |
31 | |
502 | 32 (globally-declare-fboundp |
33 '(x-get-resource)) | |
34 | |
428 | 35 (defun x-bogosity-check-resource (name class type) |
36 "Check for a bogus resource specification." | |
37 (let ((bogus (x-get-resource | |
38 (concat "__no-such-friggin-locale__." name) | |
39 (concat "__No-such-friggin-widget__." class) | |
40 type 'global nil t))) | |
41 (if bogus | |
42 (display-warning | |
43 'resource | |
44 (format "Bad resource specification encountered: something like | |
45 Emacs*%s: %s | |
46 You should replace the * with a . in order to get proper behavior when | |
47 you use the specifier and/or `set-face-*' functions." name bogus))))) | |
48 | |
49 (defun x-init-specifier-from-resources (specifier type locale | |
50 &rest resource-list) | |
51 "Initialize a specifier from the resource database. | |
52 LOCALE specifies the locale that is to be initialized and should be | |
53 a frame, a device, or 'global. TYPE is the type of the resource and | |
54 should be one of 'string, 'boolean, 'integer, or 'natnum. The | |
55 remaining args should be conses of names and classes of resources | |
56 to be examined. The first resource with a value specified becomes | |
57 the spec for SPECIFIER in LOCALE. (However, if SPECIFIER already | |
58 has a spec in LOCALE, nothing is done.) Finally, if LOCALE is 'global, | |
59 a check is done for bogus resource specifications." | |
60 (if (eq locale 'global) | |
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
61 (mapc #'(lambda (x) |
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
62 (x-bogosity-check-resource (car x) (cdr x) type)) |
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
63 resource-list)) |
428 | 64 (if (not (specifier-spec-list specifier locale)) |
65 (catch 'done | |
66 (while resource-list | |
67 (let* ((name (caar resource-list)) | |
68 (class (cdar resource-list)) | |
69 (resource | |
442 | 70 (x-get-resource name class type locale nil 'warn))) |
428 | 71 (if resource |
72 (progn | |
73 (add-spec-to-specifier specifier resource locale) | |
74 (throw 'done t)))) | |
75 (setq resource-list (cdr resource-list)))))) | |
76 | |
77 (defun x-get-resource-and-bogosity-check (name class type &optional locale) | |
78 (x-bogosity-check-resource name class type) | |
442 | 79 (x-get-resource name class type locale nil 'warn)) |
428 | 80 |
81 (defun x-get-resource-and-maybe-bogosity-check (name class type &optional | |
82 locale) | |
83 (if (eq locale 'global) | |
84 (x-bogosity-check-resource name class type)) | |
442 | 85 (x-get-resource name class type locale nil 'warn)) |
428 | 86 |
5324
d0bb90d90736
Provide #'device-x-display, as documented in Lispref; thanks, Jeff Mincy.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
87 (defun device-x-display (&optional device) |
d0bb90d90736
Provide #'device-x-display, as documented in Lispref; thanks, Jeff Mincy.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
88 "If DEVICE is an X11 device, return its DISPLAY. |
d0bb90d90736
Provide #'device-x-display, as documented in Lispref; thanks, Jeff Mincy.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
89 |
d0bb90d90736
Provide #'device-x-display, as documented in Lispref; thanks, Jeff Mincy.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
90 DEVICE defaults to the selected device." |
d0bb90d90736
Provide #'device-x-display, as documented in Lispref; thanks, Jeff Mincy.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
91 (and (eq 'x (device-type device)) (device-connection device))) |
d0bb90d90736
Provide #'device-x-display, as documented in Lispref; thanks, Jeff Mincy.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
92 |
428 | 93 ;;; x-misc.el ends here |