Mercurial > hg > xemacs-beta
view lisp/gutter-items.el @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | cd167465bf69 |
| children | b9167d522a9a |
line wrap: on
line source
;;; gutter-items.el --- Gutter content for XEmacs. ;; Copyright (C) 1999 Free Software Foundation, Inc. ;; Maintainer: XEmacs Development Team ;; Keywords: frames, extensions, internal, dumped ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Gutter-specific buffers tab code (defvar gutter-buffers-tab nil "A tab widget in the gutter for displaying buffers. Do not set this. Use `set-glyph-image' to change the properties of the tab.") (defcustom gutter-buffers-tab-visible-p (gutter-element-visible-p default-gutter-visible-p 'buffers-tab) "Whether the buffers tab is globally visible. This option should be set through the options menu." :group 'buffers-tab :type 'boolean :set #'(lambda (var val) (set-gutter-element-visible-p default-gutter-visible-p 'buffers-tab val) (setq gutter-buffers-tab-visible-p val))) (defcustom gutter-buffers-tab-enabled t "*Whether to enable support for buffers tab in the gutter. This is different to `gutter-buffers-tab-visible-p' which still runs hooks even when the gutter is invisible." :group 'buffers-tab :type 'boolean) (defvar gutter-buffers-tab-orientation 'top "Where the buffers tab currently is. Do not set this.") (defcustom buffers-tab-max-size 6 "*Maximum number of entries which may appear on the \"Buffers\" tab. If this is 10, then only the ten most-recently-selected buffers will be shown. If this is nil, then all buffers will be shown. Setting this to a large number or nil will slow down tab responsiveness." :type '(choice (const :tag "Show all" nil) (integer 6)) :group 'buffers-tab) (defcustom buffers-tab-switch-to-buffer-function 'buffers-tab-switch-to-buffer "*The function to call to select a buffer from the buffers tab. `switch-to-buffer' is a good choice, as is `pop-to-buffer'." :type '(radio (function-item switch-to-buffer) (function-item pop-to-buffer) (function :tag "Other")) :group 'buffers-tab) (defcustom buffers-tab-omit-function 'buffers-tab-omit-some-buffers "*If non-nil, a function specifying the buffers to omit from the buffers tab. This is passed a buffer and should return non-nil if the buffer should be omitted. The default value `buffers-tab-omit-some-buffers' omits buffers based on the value of `buffers-tab-omit-list'." :type '(choice (const :tag "None" nil) function) :group 'buffers-tab) (defcustom buffers-tab-omit-list '("\\` ") "*A list of types of buffers to omit from the buffers tab. This is only used if `buffers-tab-omit-function' is set to `buffers-tab-omit-some-buffers', its default value." :type '(checklist :greedy t :format "%{Omit List%}: \n%v" (const :tag "Invisible buffers (those whose names start with a space) " "\\` ") (const :tag "Help buffers " "\\`\\*Help") (const :tag "Customize buffers " "\\`\\*Customize") (const :tag "`special' buffers (those whose names start with *) " "\\`\\*") (const :tag "`special' buffers other than *scratch*" "\\`\\*\\([^s]\\|s[^c]\\|sc[^r]\\|scr[^a]\\|scra[^t]\\|scrat[^c]\\|scratc[^h]\\|scratch[^*]\\|scratch\\*.+\\)")) :group 'buffers-tab) (defvar buffers-tab-selection-function 'select-buffers-tab-buffers-by-mode "*If non-nil, a function specifying the buffers to select in the buffers tab. This is passed two buffers and should return non-nil if the first buffer should be selected. The default value `select-buffers-tab-buffers-by-mode' groups buffers by major mode and by `buffers-tab-grouping-regexp'.") (make-obsolete-variable buffers-tab-selection-function "Set `buffers-tab-filter-functions' instead.") (defcustom buffers-tab-filter-functions (list 'select-buffers-tab-buffers-by-mode) "*A list of functions specifying buffers to display in the buffers tab. If nil, all buffers are kept, up to `buffers-tab-max-size', in usual order. Otherwise, each function in the list must take arguments (BUF1 BUF2). BUF1 is the candidate, and BUF2 is the current buffer (first in the buffers list). The function should return non-nil if BUF1 should be added to the buffers tab. BUF1 will be omitted if any of the functions returns nil. Defaults to `select-buffers-tab-buffers-by-mode', which adds BUF1 if BUF1 and BUF2 have the same major mode, or both match `buffers-tab-grouping-regexp'." :type '(repeat function) :group 'buffers-tab) (defcustom buffers-tab-sort-function nil "*If non-nil, a function specifying the buffers to select from the buffers tab. This is passed the buffer list and returns the list in the order desired for the tab widget. The default value `nil' leaves the list in `buffer-list' order (usual most-recently-selected-first)." :type '(choice (const :tag "None" nil) function) :group 'buffers-tab) (make-face 'buffers-tab "Face for displaying the buffers tab.") (set-face-parent 'buffers-tab 'modeline) (defcustom buffers-tab-face 'buffers-tab "*Face to use for displaying the buffers tab." :type 'face :group 'buffers-tab) (defcustom buffers-tab-grouping-regexp '("^\\(gnus-\\|message-mode\\|mime/viewer-mode\\)" "^\\(emacs-lisp-\\|lisp-\\)") "*If non-nil, a list of regular expressions for buffer grouping. Each regular expression is applied to the current major-mode symbol name and mode-name, if it matches then any other buffers that match the same regular expression be added to the current group." :type '(choice (const :tag "None" nil) sexp) :group 'buffers-tab) (defcustom buffers-tab-format-buffer-line-function 'format-buffers-tab-line "*The function to call to return a string to represent a buffer in the buffers tab. The function is passed a buffer and should return a string. The default value `format-buffers-tab-line' just returns the name of the buffer, optionally truncated to `buffers-tab-max-buffer-line-length'. Also check out `slow-format-buffers-menu-line' which returns a whole bunch of info about a buffer." :type 'function :group 'buffers-tab) (defvar buffers-tab-default-buffer-line-length (make-specifier-and-init 'generic '((global ((default) . 25))) t) "*Maximum length of text which may appear in a \"Buffers\" tab. This is a specifier, use set-specifier to modify it.") (defcustom buffers-tab-max-buffer-line-length (specifier-instance buffers-tab-default-buffer-line-length) "*Maximum length of text which may appear in a \"Buffers\" tab. Buffer names over this length will be truncated with elipses. If this is 0, then the full buffer name will be shown." :type '(choice (const :tag "Show all" 0) (integer 25)) :group 'buffers-tab :set #'(lambda (var val) (set-specifier buffers-tab-default-buffer-line-length val) (setq buffers-tab-max-buffer-line-length val))) (defun buffers-tab-switch-to-buffer (buffer) "For use as a value for `buffers-tab-switch-to-buffer-function'." (unless (eq (window-buffer) buffer) ;; this used to add the norecord flag to both calls below. ;; this is bogus because it is a pervasive assumption in XEmacs ;; that the current buffer is at the front of the buffers list. ;; for example, select an item and then do M-C-l ;; (switch-to-other-buffer). Things get way confused. (if (> (length (windows-of-buffer buffer)) 0) (select-window (car (windows-of-buffer buffer))) (switch-to-buffer buffer)))) (defun select-buffers-tab-buffers-by-mode (buffer-to-select buf1) "For use as a value of `buffers-tab-selection-function'. This selects buffers by major mode `buffers-tab-grouping-regexp'." (let ((mode1 (symbol-name (symbol-value-in-buffer 'major-mode buf1))) (mode2 (symbol-name (symbol-value-in-buffer 'major-mode buffer-to-select))) (modenm1 (symbol-value-in-buffer 'mode-name buf1)) (modenm2 (symbol-value-in-buffer 'mode-name buffer-to-select))) (cond ((or (eq mode1 mode2) (eq modenm1 modenm2) (and (string-match "^[^-]+-" mode1) (string-match (concat "^" (regexp-quote (substring mode1 0 (match-end 0)))) mode2)) (and buffers-tab-grouping-regexp (find-if #'(lambda (x) (or (and (string-match x mode1) (string-match x mode2)) (and (string-match x modenm1) (string-match x modenm2)))) buffers-tab-grouping-regexp))) t) (t nil)))) (defun format-buffers-tab-line (buffer) "For use as a value of `buffers-tab-format-buffer-line-function'. This just returns the buffer's name, optionally truncated." (let ((len (specifier-instance buffers-tab-default-buffer-line-length))) (if (and (> len 0) (> (length (buffer-name buffer)) len)) (if (string-match ".*<.>$" (buffer-name buffer)) (concat (substring (buffer-name buffer) 0 (- len 6)) "..." (substring (buffer-name buffer) -3)) (concat (substring (buffer-name buffer) 0 (- len 3)) "...")) (buffer-name buffer)))) (defsubst build-buffers-tab-internal (buffers) (let ((selected t)) (mapcar #'(lambda (buffer) (prog1 (vector (funcall buffers-tab-format-buffer-line-function buffer) (list buffers-tab-switch-to-buffer-function (buffer-name buffer)) :selected selected) (when selected (setq selected nil)))) buffers))) ;;; #### SJT would like this function to have a sort function list. I ;;; don't see how this could work given that sorting is not ;;; cumulative --andyp. (defun buffers-tab-items (&optional in-deletion frame force-selection) "Return a list of tab instantiators based on the current buffers list. This function is used as the tab filter for the top-level buffers \"Buffers\" tab. It dynamically creates a list of tab instantiators to use as the contents of the tab. The contents and order of the list is controlled by `buffers-tab-filter-functions' which by default groups buffers according to major mode and removes invisible buffers. You can control how many buffers will be shown by setting `buffers-tab-max-size'. You can control the text of the tab items by redefining the function `format-buffers-menu-line'." (save-match-data ;; NB it is too late if we run the omit function as part of the ;; filter functions because we need to know which buffer is the ;; context buffer before they get run. (let* ((buffers (delete-if buffers-tab-omit-function (buffer-list frame))) (first-buf (car buffers))) ;; maybe force the selected window (when (and force-selection (not in-deletion) (not (eq first-buf (window-buffer (selected-window frame))))) (setq buffers (cons (window-buffer (selected-window frame)) (delq first-buf buffers)))) ;; if we're in deletion ignore the current buffer (when in-deletion (setq buffers (delq (current-buffer) buffers)) (setq first-buf (car buffers))) ;; filter buffers (when buffers-tab-filter-functions (setq buffers (delete-if #'null (mapcar #'(lambda (buf) (let ((tmp-buf buf)) (mapc #'(lambda (fun) (unless (funcall fun buf first-buf) (setq tmp-buf nil))) buffers-tab-filter-functions) tmp-buf)) buffers)))) ;; maybe shorten list of buffers (and (integerp buffers-tab-max-size) (> buffers-tab-max-size 1) (> (length buffers) buffers-tab-max-size) (setcdr (nthcdr (1- buffers-tab-max-size) buffers) nil)) ;; sort buffers in group (default is most-recently-selected) (when buffers-tab-sort-function (setq buffers (funcall buffers-tab-sort-function buffers))) ;; convert list of buffers to list of structures used by tab widget (setq buffers (build-buffers-tab-internal buffers)) buffers))) (defun add-tab-to-gutter () "Put a tab control in the gutter area to hold the most recent buffers." (setq gutter-buffers-tab-orientation (default-gutter-position)) (let* ((gutter-string (copy-sequence "\n")) (gutter-buffers-tab-extent (make-extent 0 1 gutter-string))) (set-extent-begin-glyph gutter-buffers-tab-extent (setq gutter-buffers-tab (make-glyph))) ;; Nuke all existing tabs (remove-gutter-element top-gutter 'buffers-tab) (remove-gutter-element bottom-gutter 'buffers-tab) (remove-gutter-element left-gutter 'buffers-tab) (remove-gutter-element right-gutter 'buffers-tab) ;; Put tabs into all devices that will be able to display them (mapcar #'(lambda (x) (when (valid-image-instantiator-format-p 'tab-control x) (cond ((eq gutter-buffers-tab-orientation 'top) ;; This looks better than a 3d border (set-specifier top-gutter-border-width 0 'global x) (set-gutter-element top-gutter 'buffers-tab gutter-string 'global x)) ((eq gutter-buffers-tab-orientation 'bottom) (set-specifier bottom-gutter-border-width 0 'global x) (set-gutter-element bottom-gutter 'buffers-tab gutter-string 'global x)) ((eq gutter-buffers-tab-orientation 'left) (set-specifier left-gutter-border-width 0 'global x) (set-gutter-element left-gutter 'buffers-tab gutter-string 'global x)) ((eq gutter-buffers-tab-orientation 'right) (set-specifier right-gutter-border-width 0 'global x) (set-gutter-element right-gutter 'buffers-tab gutter-string 'global x)) ))) (console-type-list)))) (defun update-tab-in-gutter (frame &optional force-selection) "Update the tab control in the gutter area." ;; dedicated frames don't get tabs (unless (or (window-dedicated-p (frame-selected-window frame)) (frame-property frame 'popup)) (when (specifier-instance default-gutter-visible-p frame) (unless (and gutter-buffers-tab (eq (default-gutter-position) gutter-buffers-tab-orientation)) (add-tab-to-gutter)) (when (valid-image-instantiator-format-p 'tab-control frame) (let ((items (buffers-tab-items nil frame force-selection))) (when items (set-glyph-image gutter-buffers-tab (vector 'tab-control :descriptor "Buffers" :face buffers-tab-face :orientation gutter-buffers-tab-orientation (if (or (eq gutter-buffers-tab-orientation 'top) (eq gutter-buffers-tab-orientation 'bottom)) :pixel-width :pixel-height) (if (or (eq gutter-buffers-tab-orientation 'top) (eq gutter-buffers-tab-orientation 'bottom)) '(gutter-pixel-width) '(gutter-pixel-height)) :items items) frame) ;; set-glyph-image will not make the gutter dirty (set-gutter-dirty-p gutter-buffers-tab-orientation))))))) ;; A myriad of different update hooks all doing slightly different things (add-one-shot-hook 'after-init-hook #'(lambda () ;; don't add the hooks if the user really doesn't want them (when gutter-buffers-tab-enabled (add-hook 'create-frame-hook #'(lambda (frame) (when gutter-buffers-tab (update-tab-in-gutter frame t)))) (add-hook 'buffer-list-changed-hook 'update-tab-in-gutter) (add-hook 'default-gutter-position-changed-hook #'(lambda () (when gutter-buffers-tab (mapc #'update-tab-in-gutter (frame-list))))) (add-hook 'gutter-element-visibility-changed-hook #'(lambda (prop visible-p) (when (and (eq prop 'buffers-tab) visible-p) (mapc #'update-tab-in-gutter (frame-list))))) (update-tab-in-gutter (selected-frame) t)))) ;; ;; progress display ;; ripped off from message display ;; (defcustom progress-feedback-use-echo-area nil "*Whether progress gauge display should display in the echo area. If NIL then progress gauges will be displayed with whatever native widgets are available on the current console. If non-NIL then progress display will be textual and displayed in the echo area." :type 'boolean :group 'gutter) (defvar progress-glyph-height 24 "Height of the progress gauge glyph.") (defvar progress-feedback-popup-period 0.5 "The time that the progress gauge should remain up after completion") (defcustom progress-feedback-style 'large "*Control the appearance of the progress gauge. If 'large, the default, then the progress-feedback text is displayed above the gauge itself. If 'small then the gauge and text are arranged side-by-side." :group 'gutter :type '(choice (const :tag "large" large) (const :tag "small" small))) ;; private variables (defvar progress-text-instantiator [string :data ""]) (defvar progress-layout-glyph (make-glyph)) (defvar progress-layout-instantiator nil) (defvar progress-gauge-instantiator [progress-gauge :value 0 :pixel-height (eval progress-glyph-height) :pixel-width 250 :descriptor "Progress"]) (defun set-progress-feedback-instantiator (&optional locale) (cond ((eq progress-feedback-style 'small) (setq progress-glyph-height 16) (setq progress-layout-instantiator `[layout :orientation horizontal :margin-width 4 :items (,progress-gauge-instantiator [button :pixel-height (eval progress-glyph-height) ;; 'quit is special and acts "asynchronously". :descriptor "Stop" :callback 'quit] ,progress-text-instantiator)]) (set-glyph-image progress-layout-glyph progress-layout-instantiator locale)) (t (setq progress-glyph-height 24) (setq progress-layout-instantiator `[layout :orientation vertical :margin-width 4 :horizontally-justify left :vertically-justify center :items (,progress-text-instantiator [layout :orientation horizontal :items (,progress-gauge-instantiator [button :pixel-height (eval progress-glyph-height) :descriptor " Stop " ;; 'quit is special and acts "asynchronously". :callback 'quit])])]) (set-glyph-image progress-layout-glyph progress-layout-instantiator locale)))) (defvar progress-abort-glyph (make-glyph)) (defun set-progress-abort-instantiator (&optional locale) (set-glyph-image progress-abort-glyph `[layout :orientation vertical :horizontally-justify left :vertically-justify center :items (,progress-text-instantiator [layout :margin-width 4 :pixel-height progress-glyph-height :orientation horizontal])] locale)) (defvar progress-stack nil "An alist of label/string pairs representing active progress gauges. The first element in the list is currently displayed in the gutter area. Do not modify this directly--use the `progress-feedback' or `display-progress-feedback'/`clear-progress-feedback' functions.") (defun progress-feedback-displayed-p (&optional return-string frame) "Return a non-nil value if a progress gauge is presently displayed in the gutter area. If optional argument RETURN-STRING is non-nil, return a string containing the message, otherwise just return t." (let ((buffer (get-buffer-create " *Gutter Area*"))) (and (< (point-min buffer) (point-max buffer)) (if return-string (buffer-substring nil nil buffer) t)))) ;;; Returns the string which remains in the echo area, or nil if none. ;;; If label is nil, the whole message stack is cleared. (defun clear-progress-feedback (&optional label frame no-restore) "Remove any progress gauge with LABEL from the progress gauge-stack, erasing it from the gutter area if it's currently displayed there. If a message remains at the head of the progress-stack and NO-RESTORE is nil, it will be displayed. The string which remains in the gutter area will be returned, or nil if the progress-stack is now empty. If LABEL is nil, the entire progress-stack is cleared. Unless you need the return value or you need to specify a label, you should just use (progress nil)." (if (or (not (valid-image-instantiator-format-p 'progress-gauge frame)) progress-feedback-use-echo-area) (clear-message label frame nil no-restore) (or frame (setq frame (selected-frame))) (remove-progress-feedback label frame) (let ((inhibit-read-only t)) (erase-buffer (get-buffer-create " *Gutter Area*"))) (if no-restore nil ; just preparing to put another msg up (if progress-stack (let ((oldmsg (cdr (car progress-stack)))) (raw-append-progress-feedback oldmsg nil frame) oldmsg) ;; nothing to display so get rid of the gauge (set-specifier bottom-gutter-border-width 0 frame) (set-gutter-element-visible-p bottom-gutter-visible-p 'progress nil frame))))) (defun progress-feedback-clear-when-idle (&optional label) (add-one-shot-hook 'pre-idle-hook `(lambda () (clear-progress-feedback ',label)))) (defun remove-progress-feedback (&optional label frame) ;; If label is nil, we want to remove all matching progress gauges. (while (and progress-stack (or (null label) ; null label means clear whole stack (eq label (car (car progress-stack))))) (setq progress-stack (cdr progress-stack))) (let ((s progress-stack)) (while (cdr s) (let ((msg (car (cdr s)))) (if (eq label (car msg)) (progn (setcdr s (cdr (cdr s)))) (setq s (cdr s))))))) (defun progress-feedback-dispatch-non-command-events () ;; don't allow errors to hose things (condition-case nil ;; (sit-for 0) causes more redisplay than we want. (dispatch-non-command-events) (t nil))) (defun append-progress-feedback (label message &optional value frame) (or frame (setq frame (selected-frame))) ;; Add a new entry to the message-stack, or modify an existing one (let* ((top (car progress-stack)) (tmsg (cdr top))) (if (eq label (car top)) (progn (setcdr top message) (if (equal tmsg message) (progn (set-instantiator-property progress-gauge-instantiator :value value) (set-progress-feedback-instantiator (frame-selected-window frame))) (raw-append-progress-feedback message value frame)) (redisplay-gutter-area)) (push (cons label message) progress-stack) (raw-append-progress-feedback message value frame)) (progress-feedback-dispatch-non-command-events) ;; either get command events or sit waiting for them (when (eq value 100) ; (sit-for progress-feedback-popup-period nil) (clear-progress-feedback label)))) (defun abort-progress-feedback (label message &optional frame) (if (or (not (valid-image-instantiator-format-p 'progress-gauge frame)) progress-feedback-use-echo-area) (display-message label (concat message "aborted.") frame) (or frame (setq frame (selected-frame))) ;; Add a new entry to the message-stack, or modify an existing one (let* ((top (car progress-stack)) (inhibit-read-only t)) (if (eq label (car top)) (setcdr top message) (push (cons label message) progress-stack)) (unless (equal message "") (insert-string message (get-buffer-create " *Gutter Area*")) (let* ((gutter-string (copy-sequence "\n")) (ext (make-extent 0 1 gutter-string))) ;; do some funky display here. (set-extent-begin-glyph ext progress-abort-glyph) ;; fixup the gutter specifiers (set-gutter-element bottom-gutter 'progress gutter-string frame) (set-specifier bottom-gutter-border-width 2 frame) (set-instantiator-property progress-text-instantiator :data message) (set-progress-abort-instantiator (frame-selected-window frame)) (set-specifier bottom-gutter-height 'autodetect frame) (set-gutter-element-visible-p bottom-gutter-visible-p 'progress t frame) ;; we have to do this so redisplay is up-to-date and so ;; redisplay-gutter-area performs optimally. (redisplay-gutter-area) (sit-for progress-feedback-popup-period nil) (clear-progress-feedback label frame) (set-extent-begin-glyph ext progress-layout-glyph) (set-gutter-element bottom-gutter 'progress gutter-string frame) ))))) (defun raw-append-progress-feedback (message &optional value frame) (unless (equal message "") (let* ((inhibit-read-only t) (val (or value 0)) (gutter-string (copy-sequence "\n")) (ext (make-extent 0 1 gutter-string))) (insert-string message (get-buffer-create " *Gutter Area*")) ;; do some funky display here. (set-extent-begin-glyph ext progress-layout-glyph) ;; fixup the gutter specifiers (set-gutter-element bottom-gutter 'progress gutter-string frame) (set-specifier bottom-gutter-border-width 2 frame) (set-instantiator-property progress-gauge-instantiator :value val) (set-progress-feedback-instantiator (frame-selected-window frame)) (set-instantiator-property progress-text-instantiator :data message) (set-progress-feedback-instantiator (frame-selected-window frame)) (if (and (eq (specifier-instance bottom-gutter-height frame) 'autodetect) (gutter-element-visible-p bottom-gutter-visible-p 'progress frame)) ;; if the gauge is already visible then just draw the gutter ;; checking for user events (progn (redisplay-gutter-area) (progress-feedback-dispatch-non-command-events)) ;; otherwise make the gutter visible and redraw the frame (set-specifier bottom-gutter-height 'autodetect frame) (set-gutter-element-visible-p bottom-gutter-visible-p 'progress t frame) ;; we have to do this so redisplay is up-to-date and so ;; redisplay-gutter-area performs optimally. This may also ;; make sure the frame geometry looks ok. (progress-feedback-dispatch-non-command-events) (redisplay-frame frame) )))) (defun display-progress-feedback (label message &optional value frame) "Display a progress gauge and message in the bottom gutter area. First argument LABEL is an identifier for this message. MESSAGE is the string to display. Use `clear-progress-feedback' to remove a labelled message." (cond ((eq value 'abort) (abort-progress-feedback label message frame)) ((or (not (valid-image-instantiator-format-p 'progress-gauge frame)) progress-feedback-use-echo-area) (display-message label (concat message (if (eq value 100) "done." (make-string (/ value 5) ?.))) frame)) (t (append-progress-feedback label message value frame)))) (defun current-progress-feedback (&optional frame) "Return the current progress gauge in the gutter area, or nil. The FRAME argument is currently unused." (cdr (car progress-stack))) ;;; may eventually be frame-dependent (defun current-progress-feedback-label (&optional frame) (car (car progress-stack))) (defun progress-feedback (fmt &optional value &rest args) "Print a progress gauge and message in the bottom gutter area of the frame. The arguments are the same as to `format'. If the only argument is nil, clear any existing progress gauge." (save-excursion (if (and (null fmt) (null args)) (prog1 nil (clear-progress-feedback nil)) (let ((str (apply 'format fmt args))) (display-progress-feedback 'progress str value) str)))) (defun progress-feedback-with-label (label fmt &optional value &rest args) "Print a progress gauge and message in the bottom gutter area of the frame. LABEL is an identifier for this progress gauge. FMT is a format string to be passed to `format' along with ARGS. Optional VALUE is the current degree of progress, an integer 0-100. The remaining ARGS are passed with FMT `(apply #'format FMT ARGS)'." ;; #### sometimes the buffer gets changed temporarily. I don't know ;; why this is, so protect against it. (save-excursion (if (and (null fmt) (null args)) (prog1 nil (clear-progress-feedback label nil)) (let ((str (apply 'format fmt args))) (display-progress-feedback label str value) str)))) (defun buffers-tab-omit-some-buffers (buf) "For use as a value of `buffers-tab-omit-function'. Omit buffers based on the value of `buffers-tab-omit-list', which see." (let ((regexp (mapconcat 'concat buffers-tab-omit-list "\\|"))) (not (null (string-match regexp (buffer-name buf)))))) (provide 'gutter-items) ;;; gutter-items.el ends here.