[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master aeb3f73: * filladapt/filladapt.el: Use lexical-binding. Co
|
From: |
Stefan Monnier |
|
Subject: |
[elpa] master aeb3f73: * filladapt/filladapt.el: Use lexical-binding. Cosmetic improvements |
|
Date: |
Wed, 4 Jul 2018 16:39:26 -0400 (EDT) |
branch: master
commit aeb3f7310d1a26e904cbc4c15f8cae6b55a4f793
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
* filladapt/filladapt.el: Use lexical-binding. Cosmetic improvements
Remove ancient custom compatibility code.
Use advice-add to overload standard filling functions.
(filladapt-version): Remove.
(filladapt-token-conversion-table, filladapt-funcall): Remove.
(filladapt-mode): Use define-minor-mode.
(turn-on-filladapt-mode): Mark as obsolete.
---
packages/filladapt/filladapt.el | 451 ++++++++++++++--------------------------
1 file changed, 160 insertions(+), 291 deletions(-)
diff --git a/packages/filladapt/filladapt.el b/packages/filladapt/filladapt.el
index 74054b5..3cdd2c4 100644
--- a/packages/filladapt/filladapt.el
+++ b/packages/filladapt/filladapt.el
@@ -1,31 +1,33 @@
-;;; filladapt.el --- Adaptive fill
-
-;; Copyright (C) 1989, 1995-1998 Kyle E. Jones
-
-;; Version: 0
-
-;;; This program 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.
-;;;
-;;; This program 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.
-;;;
-;;; A copy of the GNU General Public License can be obtained from this
-;;; program's author (send electronic mail to address@hidden) or from
-;;; the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA
-;;; 02139, USA.
-;;;
-;;; Send bug reports to address@hidden
+;;; filladapt.el --- Adaptive fill -*- lexical-binding:t -*-
+
+;; Copyright (C) 1989, 1995-2018 Free Software Foundation, Inc.
+
+;; Author: Kyle E. Jones <address@hidden>
+;; Maintainer: address@hidden
+;; Version: 2.12.1
+;; Package-Requires: ((emacs "24.4"))
+
+;; This program 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 3, or (at your option)
+;; any later version.
+;;
+;; This program 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+;;
;; LCD Archive Entry:
;; filladapt|Kyle Jones|address@hidden|
;; Minor mode to adaptively set fill-prefix and overload filling functions|
;; 28-February-1998|2.12|~/packages/filladapt.el|
+;;; Commentary:
+
;; These functions enhance the default behavior of Emacs' Auto Fill
;; mode and the commands fill-paragraph, lisp-fill-paragraph,
;; fill-region-as-paragraph and fill-region.
@@ -55,11 +57,11 @@
;; buffer.
;;
;; Use
-;; (add-hook 'text-mode-hook 'turn-on-filladapt-mode)
+;; (add-hook 'text-mode-hook #'filladapt-mode)
;; to have Filladapt always enabled in Text mode.
;;
;; Use
-;; (add-hook 'c-mode-hook 'turn-off-filladapt-mode)
+;; (add-hook 'c-mode-hook #'turn-off-filladapt-mode)
;; to have Filladapt always disabled in C mode.
;;
;; In many cases, you can extend Filladapt by adding appropriate
@@ -70,44 +72,21 @@
;; filladapt-token-match-table
;; filladapt-token-conversion-table
-(and (featurep 'filladapt)
- (error "filladapt cannot be loaded twice in the same Emacs session."))
-
-(provide 'filladapt)
-
-(defvar filladapt-version "2.12debian"
- "Version string for filladapt.")
-
-;; BLOB to make custom stuff work even without customize
-(eval-and-compile
- (condition-case ()
- (require 'custom)
- (error nil))
- (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
- nil ;; We've got what we needed
- ;; We have the old custom-library, hack around it!
- (defmacro defgroup (&rest args)
- nil)
- (defmacro defcustom (var value doc &rest args)
- (` (defvar (, var) (, value) (, doc))))))
+;;; Code:
(defgroup filladapt nil
"Enhanced filling"
:group 'fill)
-(defvar filladapt-mode nil
- "Non-nil means that Filladapt minor mode is enabled.
-Use the filladapt-mode command to toggle the mode on/off.")
-(make-variable-buffer-local 'filladapt-mode)
+(defvar filladapt-mode) ;Defined later by `define-minor-mode'.
(defcustom filladapt-mode-line-string " Filladapt"
- "*String to display in the modeline when Filladapt mode is active.
+ "String to display in the modeline when Filladapt mode is active.
Set this to nil if you don't want a modeline indicator for Filladapt."
- :type 'string
- :group 'filladapt)
+ :type 'string)
(defcustom filladapt-fill-column-tolerance nil
- "*Tolerate filled paragraph lines ending this far from the fill column.
+ "Tolerate filled paragraph lines ending this far from the fill column.
If any lines other than the last paragraph line end at a column
less than fill-column - filladapt-fill-column-tolerance, fill-column will
be adjusted using the filladapt-fill-column-*-fuzz variables and
@@ -118,28 +97,19 @@ A nil value means behave normally, that is, don't try
refilling
paragraphs to make filled line lengths fit within any particular
range."
:type '(choice (const nil)
- integer)
- :group 'filladapt)
+ integer))
(defcustom filladapt-fill-column-forward-fuzz 5
- "*Try values from fill-column to fill-column plus this variable
+ "Try values from fill-column to fill-column plus this variable
when trying to make filled paragraph lines fall with the tolerance
range specified by filladapt-fill-column-tolerance."
- :type 'integer
- :group 'filladapt)
+ :type 'integer)
(defcustom filladapt-fill-column-backward-fuzz 5
- "*Try values from fill-column to fill-column minus this variable
+ "Try values from fill-column to fill-column minus this variable
when trying to make filled paragraph lines fall with the tolerance
range specified by filladapt-fill-column-tolerance."
- :type 'integer
- :group 'filladapt)
-
-;; install on minor-mode-alist
-(or (assq 'filladapt-mode minor-mode-alist)
- (setq minor-mode-alist (cons (list 'filladapt-mode
- 'filladapt-mode-line-string)
- minor-mode-alist)))
+ :type 'integer)
(defcustom filladapt-token-table
'(
@@ -227,8 +197,7 @@ Matching is done case-sensitively. The corresponding SYM is
added to the list, point is moved to (match-end 0) and the
process is repeated. The process ends when there is no REGEXP in
the table that matches what is at point."
- :type '(repeat (list regexp symbol))
- :group 'filladapt)
+ :type '(repeat (list regexp symbol)))
(defcustom filladapt-not-token-table
'(
@@ -244,8 +213,7 @@ matches what is at point then the token generator gives up
and
doesn't try any of the regexps in filladapt-token-table.
Regexp matching is done case-sensitively."
- :type '(repeat regexp)
- :group 'filladapt)
+ :type '(repeat regexp))
(defcustom filladapt-token-match-table
'(
@@ -273,8 +241,7 @@ Table format is
The first symbol SYM is the token, subsequent symbols are the
tokens that SYM will match."
- :type '(repeat (repeat symbol))
- :group 'filladapt)
+ :type '(repeat (repeat symbol)))
(defcustom filladapt-token-match-many-table
'(
@@ -285,8 +252,7 @@ If one of these tokens appears in a token list, it will eat
all
matching tokens in a token list being matched against it until it
encounters a token that doesn't match or a token that ends on
a greater column number."
- :type '(repeat symbol)
- :group 'filladapt)
+ :type '(repeat symbol))
(defcustom filladapt-token-paragraph-start-table
'(
@@ -296,8 +262,7 @@ a greater column number."
If parsing a line generates a token list containing one of
these tokens, then the line is considered to be the start of a
paragraph."
- :type '(repeat symbol)
- :group 'filladapt)
+ :type '(repeat symbol))
(defcustom filladapt-token-conversion-table
'(
@@ -324,28 +289,11 @@ HOWTO specifies how to do the conversion.
not a TAB or a space into spaces and copy the resulting string into
the fill prefix."
:type '(repeat (cons symbol (choice (const exact)
- (const spaces))))
- :group 'filladapt)
-
-(defvar filladapt-function-table
- (let ((assoc-list
- (list (cons 'fill-paragraph (symbol-function 'fill-paragraph))
- (cons 'fill-region (symbol-function 'fill-region))
- (cons 'fill-region-as-paragraph
- (symbol-function 'fill-region-as-paragraph))
- (cons 'do-auto-fill (symbol-function 'do-auto-fill)))))
- ;; v18 Emacs doesn't have lisp-fill-paragraph
- (if (fboundp 'lisp-fill-paragraph)
- (nconc assoc-list
- (list (cons 'lisp-fill-paragraph
- (symbol-function 'lisp-fill-paragraph)))))
- assoc-list )
- "Table containing the old function definitions that filladapt usurps.")
+ (const spaces)))))
(defcustom filladapt-fill-paragraph-post-hook nil
"Hooks run after filladapt runs fill-paragraph."
- :type 'hook
- :group 'filladapt)
+ :type 'hook)
(defvar filladapt-inside-filladapt nil
"Non-nil if the filladapt version of a fill function executing.
@@ -365,11 +313,10 @@ With debugging enabled, filladapt will
filladapt-debug-indentation-face-2.
b. display the current paragraph using the face specified by
filladapt-debug-paragraph-face."
- :type 'boolean
- :group 'filladapt)
+ :type 'boolean)
-(if filladapt-debug
- (add-hook 'post-command-hook 'filladapt-display-debug-info-maybe))
+;; (if filladapt-debug
+;; (add-hook 'post-command-hook #'filladapt-display-debug-info-maybe))
(defvar filladapt-debug-indentation-face-1 'highlight
"Face used to display the indentation when debugging is enabled.")
@@ -388,7 +335,9 @@ With debugging enabled, filladapt will
;; kludge city, see references in code.
(defvar filladapt-old-line-prefix)
-(defun do-auto-fill ()
+(advice-add 'do-auto-fill :around #'filladapt--do-auto-fill)
+(defun filladapt--do-auto-fill (orig-fun &resrt args)
+ "Overloading for `filladapt-mode'."
(catch 'done
(if (and filladapt-mode (null fill-prefix))
(save-restriction
@@ -404,111 +353,73 @@ With debugging enabled, filladapt will
fill-prefix retval)
(if (filladapt-adapt nil nil)
(progn
- (setq retval (filladapt-funcall 'do-auto-fill))
+ (setq retval (apply orig-fun args))
(throw 'done retval))))))
- (filladapt-funcall 'do-auto-fill)))
+ (apply orig-fun args)))
-(defun filladapt-fill-paragraph (function arg)
- (catch 'done
- (if (and filladapt-mode (null fill-prefix))
- (save-restriction
- (let ((paragraph-ignore-fill-prefix nil)
- ;; if the user wanted this stuff, they probably
- ;; wouldn't be using filladapt-mode.
- (adaptive-fill-mode nil)
- (adaptive-fill-regexp nil)
- ;; need this or Emacs 19 ignores fill-prefix when
- ;; inside a comment.
- (comment-multi-line t)
- fill-prefix retval)
- (if (filladapt-adapt t nil)
- (progn
- (if filladapt-fill-column-tolerance
- (let* ((low (- fill-column
- filladapt-fill-column-backward-fuzz))
- (high (+ fill-column
- filladapt-fill-column-forward-fuzz))
- (old-fill-column fill-column)
- (fill-column fill-column)
- (lim (- high low))
- (done nil)
- (sign 1)
- (delta 0))
- (while (not done)
- (setq retval (filladapt-funcall function arg))
- (if (filladapt-paragraph-within-fill-tolerance)
- (setq done 'success)
- (setq delta (1+ delta)
- sign (* sign -1)
- fill-column (+ fill-column (* delta sign)))
- (while (and (<= delta lim)
- (or (< fill-column low)
- (> fill-column high)))
+(defun filladapt--fill-paragraph (orig-fun &optional arg &rest args)
+ "Overloading for `filladapt-mode'."
+ (let ((filladapt-inside-filladapt t))
+ (catch 'done
+ (if (and filladapt-mode (null fill-prefix))
+ (save-restriction
+ (let ((paragraph-ignore-fill-prefix nil)
+ ;; if the user wanted this stuff, they probably
+ ;; wouldn't be using filladapt-mode.
+ (adaptive-fill-mode nil)
+ (adaptive-fill-regexp nil)
+ ;; need this or Emacs 19 ignores fill-prefix when
+ ;; inside a comment.
+ (comment-multi-line t)
+ fill-prefix retval)
+ (if (filladapt-adapt t nil)
+ (progn
+ (if filladapt-fill-column-tolerance
+ (let* ((low (- fill-column
+ filladapt-fill-column-backward-fuzz))
+ (high (+ fill-column
+ filladapt-fill-column-forward-fuzz))
+ (old-fill-column fill-column)
+ (fill-column fill-column)
+ (lim (- high low))
+ (done nil)
+ (sign 1)
+ (delta 0))
+ (while (not done)
+ (setq retval (apply orig-fun arg args))
+ (if (filladapt-paragraph-within-fill-tolerance)
+ (setq done 'success)
(setq delta (1+ delta)
sign (* sign -1)
- fill-column (+ fill-column
- (* delta sign))))
- (setq done (> delta lim))))
- ;; if the paragraph lines never fell
- ;; within the tolerances, refill using
- ;; the old fill-column.
- (if (not (eq done 'success))
- (let ((fill-column old-fill-column))
- (setq retval (filladapt-funcall function arg)))))
- (setq retval (filladapt-funcall function arg)))
- (run-hooks 'filladapt-fill-paragraph-post-hook)
- (throw 'done retval))))))
- ;; filladapt-adapt failed, so do fill-paragraph normally.
- (filladapt-funcall function arg)))
-
-(defun fill-paragraph (arg)
- "Fill paragraph at or after point. Prefix arg means justify as well.
-
-(This function has been overloaded with the `filladapt' version.)
-
-If `sentence-end-double-space' is non-nil, then period followed by one
-space does not end a sentence, so don't break a line there.
-
-If `fill-paragraph-function' is non-nil, we call it (passing our
-argument to it), and if it returns non-nil, we simply return its value."
- (interactive "*P")
- (let ((filladapt-inside-filladapt t))
- (filladapt-fill-paragraph 'fill-paragraph arg)))
-
-(defun lisp-fill-paragraph (&optional arg)
- "Like \\[fill-paragraph], but handle Emacs Lisp comments.
-
-(This function has been overloaded with the `filladapt' version.)
-
-If any of the current line is a comment, fill the comment or the
-paragraph of it that point is in, preserving the comment's indentation
-and initial semicolons."
- (interactive "*P")
- (let ((filladapt-inside-filladapt t))
- (filladapt-fill-paragraph 'lisp-fill-paragraph arg)))
-
-(defun fill-region-as-paragraph (beg end &optional justify
- nosqueeze squeeze-after)
- "Fill the region as one paragraph.
-
-(This function has been overloaded with the `filladapt' version.)
-
-It removes any paragraph breaks in the region and extra newlines at the end,
-indents and fills lines between the margins given by the
-`current-left-margin' and `current-fill-column' functions.
-It leaves point at the beginning of the line following the paragraph.
-
-Normally performs justification according to the `current-justification'
-function, but with a prefix arg, does full justification instead.
-
-From a program, optional third arg JUSTIFY can specify any type of
-justification. Fourth arg NOSQUEEZE non-nil means not to make spaces
-between words canonical before filling. Fifth arg SQUEEZE-AFTER, if non-nil,
-means don't canonicalize spaces before that position.
-
-If `sentence-end-double-space' is non-nil, then period followed by one
-space does not end a sentence, so don't break a line there."
- (interactive "*r\nP")
+ fill-column (+ fill-column (* delta sign)))
+ (while (and (<= delta lim)
+ (or (< fill-column low)
+ (> fill-column high)))
+ (setq delta (1+ delta)
+ sign (* sign -1)
+ fill-column (+ fill-column
+ (* delta sign))))
+ (setq done (> delta lim))))
+ ;; if the paragraph lines never fell
+ ;; within the tolerances, refill using
+ ;; the old fill-column.
+ (if (not (eq done 'success))
+ (let ((fill-column old-fill-column))
+ (setq retval (apply orig-fun arg args)))))
+ (setq retval (apply orig-fun arg args)))
+ (run-hooks 'filladapt-fill-paragraph-post-hook)
+ (throw 'done retval))))))
+ ;; filladapt-adapt failed, so do fill-paragraph normally.
+ (apply orig-fun arg args))))
+
+(advice-add 'fill-paragraph :around #'filladapt--fill-paragraph)
+(advice-add 'lisp-fill-paragraph :around #'filladapt--fill-paragraph)
+
+(advice-add 'fill-region-as-paragraph :around
+ #'filladapt--fill-region-as-paragraph)
+(defun filladapt--fill-region-as-paragraph (orig-fun beg end &optional justify
+ &rest args)
+ "Overloading for `filladapt-mode'."
(if (and filladapt-mode (not filladapt-inside-filladapt))
(save-restriction
(narrow-to-region beg end)
@@ -540,34 +451,11 @@ space does not end a sentence, so don't break a line
there."
;; fill-region-as-paragraph to do this. If we don't do
;; it, fill-region will spin in an endless loop.
(goto-char (point-max)))
- (condition-case nil
- ;; five args for Emacs 19.31
- (filladapt-funcall 'fill-region-as-paragraph beg end
- justify nosqueeze squeeze-after)
- (wrong-number-of-arguments
- (condition-case nil
- ;; four args for Emacs 19.29
- (filladapt-funcall 'fill-region-as-paragraph beg end
- justify nosqueeze)
- ;; three args for the rest of the world.
- (wrong-number-of-arguments
- (filladapt-funcall 'fill-region-as-paragraph beg end justify)))))))
-
-(defun fill-region (beg end &optional justify nosqueeze to-eop)
- "Fill each of the paragraphs in the region.
-
-(This function has been overloaded with the `filladapt' version.)
-
-Prefix arg (non-nil third arg, if called from program) means justify as well.
-
-Noninteractively, fourth arg NOSQUEEZE non-nil means to leave
-whitespace other than line breaks untouched, and fifth arg TO-EOP
-non-nil means to keep filling to the end of the paragraph (or next
-hard newline, if `use-hard-newlines' is on).
-
-If `sentence-end-double-space' is non-nil, then period followed by one
-space does not end a sentence, so don't break a line there."
- (interactive "*r\nP")
+ (apply orig-fun beg end justify args)))
+
+(advice-add 'fill-region :around #'filladapt--fill-region)
+(defun filladapt--fill-region (orig-fun beg end &optional justify &rest args)
+ "Overloading for `filladapt-mode'."
(if (and filladapt-mode (not filladapt-inside-filladapt))
(save-restriction
(narrow-to-region beg end)
@@ -582,7 +470,7 @@ space does not end a sentence, so don't break a line there."
(progn
(save-restriction
(narrow-to-region start (point))
- (fill-region start (point) justify nosqueeze to-eop)
+ (apply #'fill-region start (point) justify args)
(goto-char (point-max)))
(if (and (not (bolp)) (not (eobp)))
(forward-line 1))))
@@ -595,45 +483,28 @@ space does not end a sentence, so don't break a line
there."
(goto-char (point-max)))
(if (and (not (bolp)) (not (eobp)))
(forward-line 1)))))))
- (condition-case nil
- (filladapt-funcall 'fill-region beg end justify nosqueeze to-eop)
- (wrong-number-of-arguments
- (condition-case nil
- (filladapt-funcall 'fill-region beg end justify nosqueeze)
- (wrong-number-of-arguments
- (filladapt-funcall 'fill-region beg end justify)))))))
+ (apply orig-fun beg end justify args)))
(defvar zmacs-region-stays) ; for XEmacs
-(defun filladapt-mode (&optional arg)
+;;;###autoload
+(define-minor-mode filladapt-mode
"Toggle Filladapt minor mode.
With arg, turn Filladapt mode on iff arg is positive. When
Filladapt mode is enabled, auto-fill-mode and the fill-paragraph
command are both smarter about guessing a proper fill-prefix and
finding paragraph boundaries when bulleted and indented lines and
paragraphs are used."
- (interactive "P")
+ :lighter filladapt-mode-line-string
;; don't deactivate the region.
- (setq zmacs-region-stays t)
- (setq filladapt-mode (or (and arg (> (prefix-numeric-value arg) 0))
- (and (null arg) (null filladapt-mode))))
- (if (fboundp 'force-mode-line-update)
- (force-mode-line-update)
- (set-buffer-modified-p (buffer-modified-p))))
-
-(defun turn-on-filladapt-mode ()
- "Unconditionally turn on Filladapt mode in the current buffer."
- (interactive)
- (filladapt-mode 1))
+ (setq zmacs-region-stays t))
+
+(define-obsolete-function-alias 'turn-on-filladapt-mode #'filladapt-mode "")
(defun turn-off-filladapt-mode ()
"Unconditionally turn off Filladapt mode in the current buffer."
(filladapt-mode -1))
-(defun filladapt-funcall (function &rest args)
- "Call the old definition of a function that filladapt has usurped."
- (apply (cdr (assoc function filladapt-function-table)) args))
-
(defun filladapt-paragraph-start (list)
"Returns non-nil if LIST contains a paragraph starting token.
LIST should be a token list as returned by filladapt-parse-prefixes."
@@ -778,7 +649,7 @@ filladapt-token-conversion-table specifies how this is
done."
(nth 2 (car list))
prefix-list))))
(setq list (cdr list)))
- (apply (function concat) (nreverse prefix-list)) ))
+ (apply #'concat (nreverse prefix-list))))
(defun filladapt-paragraph-within-fill-tolerance ()
(catch 'done
@@ -796,15 +667,12 @@ filladapt-token-conversion-table specifies how this is
done."
(defun filladapt-convert-to-spaces (string)
"Return a copy of STRING, with all non-tabs and non-space changed to spaces."
- (let ((i 0)
- (space-list '(?\ ?\t))
- (space ?\ )
- (lim (length string)))
+ (let ((space-list '(?\ ?\t))
+ (space ?\ ))
(setq string (copy-sequence string))
- (while (< i lim)
+ (dotimes (i (length string))
(if (not (memq (aref string i) space-list))
- (aset string i space))
- (setq i (1+ i)))
+ (aset string i space)))
string ))
(defun filladapt-adapt (paragraph debugging)
@@ -874,7 +742,7 @@ necessary to make certain paragraph fills work properly."
(delete-region (point-min) (point))
(insert fill-prefix)
(add-hook 'filladapt-fill-paragraph-post-hook
- 'filladapt-cleanup-kludge-at-point-min)))))
+ #'filladapt-cleanup-kludge-at-point-min)))))
t ))))
(defun filladapt-cleanup-kludge-at-point-min ()
@@ -895,40 +763,39 @@ See filladapt-adapt."
(setq list (cdr list)))
list ))
-(defun filladapt-delete-extent (e)
- (if (fboundp 'delete-extent)
- (delete-extent e)
- (delete-overlay e)))
+(defalias 'filladapt-delete-extent
+ (if (featurep 'xemacs)
+ 'delete-extent
+ #'delete-overlay))
-(defun filladapt-make-extent (beg end)
- (if (fboundp 'make-extent)
- (make-extent beg end)
- (make-overlay beg end)))
+(defalias 'filladapt-make-extent
+ (if (featurep 'xemacs)
+ 'make-extent
+ #'make-overlay))
-(defun filladapt-set-extent-endpoints (e beg end)
- (if (fboundp 'set-extent-endpoints)
- (set-extent-endpoints e beg end)
- (move-overlay e beg end)))
+(defalias 'filladapt-set-extent-endpoints
+ (if (featurep 'xemacs)
+ 'set-extent-endpoints
+ #'move-overlay))
-(defun filladapt-set-extent-property (e prop val)
- (if (fboundp 'set-extent-property)
- (set-extent-property e prop val)
- (overlay-put e prop val)))
+(defalias 'filladapt-set-extent-property
+ (if (featurep 'xemacs)
+ 'set-extent-property
+ #'overlay-put))
(defun filladapt-debug ()
"Toggle filladapt debugging on/off in the current buffer."
-;; (interactive)
- (make-local-variable 'filladapt-debug)
- (setq filladapt-debug (not filladapt-debug))
+ ;; (interactive)
+ (set (make-local-variable 'filladapt-debug) (not filladapt-debug))
(if (null filladapt-debug)
(progn
- (mapcar (function (lambda (e) (filladapt-set-extent-endpoints e 1 1)))
- filladapt-debug-indentation-extents)
+ (dolist (e filladapt-debug-indentation-extents)
+ (filladapt-set-extent-endpoints e 1 1))
(if filladapt-debug-paragraph-extent
(progn
(filladapt-delete-extent filladapt-debug-paragraph-extent)
(setq filladapt-debug-paragraph-extent nil)))))
- (add-hook 'post-command-hook 'filladapt-display-debug-info-maybe))
+ (add-hook 'post-command-hook #'filladapt-display-debug-info-maybe))
(defun filladapt-display-debug-info-maybe ()
(cond ((null filladapt-debug) nil)
@@ -946,7 +813,7 @@ See filladapt-adapt."
(let ((ei-list filladapt-debug-indentation-extents)
(ep filladapt-debug-paragraph-extent)
(face filladapt-debug-indentation-face-1)
- fill-prefix token-list)
+ fill-prefix token-list e)
(if (null (filladapt-adapt t t))
(progn
(filladapt-set-extent-endpoints ep 1 1)
@@ -967,8 +834,7 @@ See filladapt-adapt."
(setq e (filladapt-make-extent 1 1))
(filladapt-set-extent-property e 'detachable nil)
(filladapt-set-extent-property e 'evaporate nil)
- (setq filladapt-debug-indentation-extents
- (cons e filladapt-debug-indentation-extents)))
+ (push e filladapt-debug-indentation-extents))
(filladapt-set-extent-property e 'face face)
(filladapt-set-extent-endpoints e (point)
(progn
@@ -976,10 +842,13 @@ See filladapt-adapt."
(nth 1
(car token-list)))
(point)))
- (if (eq face filladapt-debug-indentation-face-1)
- (setq face filladapt-debug-indentation-face-2)
- (setq face filladapt-debug-indentation-face-1))
+ (setq face (if (eq face filladapt-debug-indentation-face-1)
+ filladapt-debug-indentation-face-2
+ filladapt-debug-indentation-face-1))
(setq token-list (cdr token-list)))
(while ei-list
(filladapt-set-extent-endpoints (car ei-list) 1 1)
(setq ei-list (cdr ei-list))))))))))
+
+(provide 'filladapt)
+;;; filladapt.el ends here
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] master aeb3f73: * filladapt/filladapt.el: Use lexical-binding. Cosmetic improvements,
Stefan Monnier <=