Mercurial > emacs
changeset 69070:efaafdfc3b2c
*** empty log message ***
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Tue, 21 Feb 2006 09:41:20 +0000 |
| parents | 398e6b9e9f87 |
| children | ee6d3763fda6 |
| files | lisp/ChangeLog lisp/fringe.el lispref/ChangeLog src/ChangeLog |
| diffstat | 4 files changed, 41 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Feb 21 08:43:27 2006 +0000 +++ b/lisp/ChangeLog Tue Feb 21 09:41:20 2006 +0000 @@ -1,4 +1,10 @@ -2006-02-21 Giorgos Keramidas <keramida@ceid.upatras.gr> +2006-02-21 Kim F. Storm <storm@cua.dk> + + * fringe.el: Cleanup as file is now pre-loaded. + (fringe-bitmaps): Initialize unconditionally. + (fringe-mode, set-fringe-style): Remove autoload cookies. + +2006-02-21 Giorgos Keramidas <keramida@ceid.upatras.gr> (tiny change) * fringe.el (fringe-bitmaps): Rename `horisontal-bar' to `horizontal-bar'.
--- a/lisp/fringe.el Tue Feb 21 08:43:27 2006 +0000 +++ b/lisp/fringe.el Tue Feb 21 09:41:20 2006 +0000 @@ -1,4 +1,4 @@ -;;; fringe.el --- change fringes appearance in various ways +;;; fringe.el --- fringe setup and control ;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -25,8 +25,9 @@ ;;; Commentary: -;; This file contains helpful functions for customizing the appearance -;; of the fringe. +;; This file contains code to initialize the built-in fringe bitmaps +;; as well as helpful functions for customizing the appearance of the +;; fringe. ;; The code is influenced by scroll-bar.el and avoid.el. The author ;; gratefully acknowledge comments and suggestions made by Miles @@ -40,33 +41,25 @@ :version "22.1" :group 'frames) -;; Standard fringe bitmaps - -(defmacro fringe-bitmap-p (symbol) - "Return non-nil if SYMBOL is a fringe bitmap." - `(get ,symbol 'fringe)) - -(defvar fringe-bitmaps) +;; Define the built-in fringe bitmaps and setup default mappings -(unless (or (not (boundp 'fringe-bitmaps)) - (get 'left-truncation 'fringe)) - (let ((bitmaps '(question-mark - left-arrow right-arrow up-arrow down-arrow - left-curly-arrow right-curly-arrow - left-triangle right-triangle - top-left-angle top-right-angle - bottom-left-angle bottom-right-angle - left-bracket right-bracket - filled-rectangle hollow-rectangle - filled-square hollow-square - vertical-bar horizontal-bar - empty-line)) - (bn 1)) - (while bitmaps - (push (car bitmaps) fringe-bitmaps) - (put (car bitmaps) 'fringe bn) - (setq bitmaps (cdr bitmaps) - bn (1+ bn))))) +(let ((bitmaps '(question-mark + left-arrow right-arrow up-arrow down-arrow + left-curly-arrow right-curly-arrow + left-triangle right-triangle + top-left-angle top-right-angle + bottom-left-angle bottom-right-angle + left-bracket right-bracket + filled-rectangle hollow-rectangle + filled-square hollow-square + vertical-bar horizontal-bar + empty-line)) + (bn 1)) + (while bitmaps + (push (car bitmaps) fringe-bitmaps) + (put (car bitmaps) 'fringe bn) + (setq bitmaps (cdr bitmaps) + bn (1+ bn)))) (setq-default fringe-indicator-alist '((truncation . (left-arrow right-arrow)) @@ -89,6 +82,12 @@ (hbar . horizontal-bar) (hollow-small . hollow-square))) + +(defmacro fringe-bitmap-p (symbol) + "Return non-nil if SYMBOL is a fringe bitmap." + `(get ,symbol 'fringe)) + + ;; Control presence of fringes (defvar fringe-mode) @@ -158,7 +157,6 @@ ;; Otherwise impose the user-specified value of fringe-mode. (custom-initialize-reset symbol value)))) -;;;###autoload (defcustom fringe-mode nil "*Specify appearance of fringes on all frames. This variable can be nil (the default) meaning the fringes should have @@ -216,7 +214,6 @@ nil 0))))) -;;;###autoload (defun fringe-mode (&optional mode) "Set the default appearance of fringes on all frames. @@ -242,7 +239,6 @@ (interactive (list (fringe-query-style 'all-frames))) (set-fringe-mode mode)) -;;;###autoload (defun set-fringe-style (&optional mode) "Set the default appearance of fringes on the selected frame.
--- a/lispref/ChangeLog Tue Feb 21 08:43:27 2006 +0000 +++ b/lispref/ChangeLog Tue Feb 21 09:41:20 2006 +0000 @@ -1,4 +1,4 @@ -2006-02-21 Giorgos Keramidas <keramida@ceid.upatras.gr> +2006-02-21 Giorgos Keramidas <keramida@ceid.upatras.gr> (tiny change) * display.texi (Fringe Indicators, Fringe Cursors): Fix typos.
--- a/src/ChangeLog Tue Feb 21 08:43:27 2006 +0000 +++ b/src/ChangeLog Tue Feb 21 09:41:20 2006 +0000 @@ -1,9 +1,13 @@ +2006-02-21 Kim F. Storm <storm@cua.dk> + + * fringe.c (syms_of_fringe) <fringe-bitmaps>: Doc fix. + 2006-02-21 Zhang Wei <brep@newsmth.org> * xfns.c (Fx_file_dialog, Motif and GTK): DECODE_FILE before returning it. -2006-02-21 Giorgos Keramidas <keramida@ceid.upatras.gr> +2006-02-21 Giorgos Keramidas <keramida@ceid.upatras.gr> (tiny change) * fringe.c (horizontal_bar_bits): Rename from `horisontal_bar_bits'. (standard_bitmaps): Use it.