diff options
| -rw-r--r-- | coq/coq-indent.el | 6 | ||||
| -rw-r--r-- | generic/proof-config.el | 8 | ||||
| -rw-r--r-- | generic/proof-indent.el | 41 |
3 files changed, 3 insertions, 52 deletions
diff --git a/coq/coq-indent.el b/coq/coq-indent.el index 454024c5..5f8b3f72 100644 --- a/coq/coq-indent.el +++ b/coq/coq-indent.el @@ -708,8 +708,7 @@ argument must be t if inside the {}s of a record, nil otherwise." (let ((ind (save-excursion (back-to-indentation) (coq-indent-calculate)))) (indent-line-to (max 0 ind)))) (if (< (current-column) (current-indentation)) - (back-to-indentation))) - (if proof-indent-pad-eol (proof-indent-pad-eol))) + (back-to-indentation)))) (defun coq-indent-line-not-comments () "Same as `proof-indent-line' but comments are not indented." @@ -719,8 +718,7 @@ argument must be t if inside the {}s of a record, nil otherwise." (let ((ind (save-excursion (back-to-indentation) (coq-indent-calculate t)))) (when ind (indent-line-to (max 0 ind))))) (if (< (current-column) (current-indentation)) - (back-to-indentation))) - (if proof-indent-pad-eol (proof-indent-pad-eol))) + (back-to-indentation)))) (defun coq-indent-region (start end) (let ((deb (min start end)) (fin (max start end))) diff --git a/generic/proof-config.el b/generic/proof-config.el index 08b7369b..65f2df34 100644 --- a/generic/proof-config.el +++ b/generic/proof-config.el @@ -1404,14 +1404,6 @@ assistant, for example, to compile a completed file." :type 'number :group 'proof-script) -;; FIXME: perhaps remove this setting? Users rather object to it. -(defcustom proof-indent-pad-eol nil - "*Whether to add spaces to end of lines. -If enabled, spaces are added to the end of lines in an attempt to improve -the appearance of locked regions in XEmacs." - :type 'boolean - :group 'proof-script) - (defcustom proof-indent-hang nil "Enable 'hanging' indentation for proof script." :type 'boolean diff --git a/generic/proof-indent.el b/generic/proof-indent.el index 22ff742c..c0109c03 100644 --- a/generic/proof-indent.el +++ b/generic/proof-indent.el @@ -84,45 +84,6 @@ (back-to-indentation) (proof-indent-calculate (proof-indent-offset) (proof-indent-inner-p)))))) (if (< (current-column) (current-indentation)) - (back-to-indentation)))) - (if proof-indent-pad-eol - (proof-indent-pad-eol))) + (back-to-indentation))))) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; -;; Useless spaces -;; - -(defun proof-indent-pad-eol (&optional col) - "Add padding to end of current line to match the previous line or COL. -This function adds useless space to buffers, but it cleans up the appearance -of locked regions in XEmacs." - ;; A hook for TAB? - (interactive) - (save-excursion - (let ((descol (or col - (save-excursion - (end-of-line 0) - (current-column))))) - (save-excursion - (end-of-line 1) - (if (or (equal (current-column) 0) ;; special case for empty lines - (> descol (current-column))) - (progn - (insert-char ?\ (- descol (current-column))))))))) - -(defun proof-indent-pad-eol-region (start end) - "Pad a region with extra spaces to the length of the longest line." - (interactive) - ;; Find the longest line.. - ;; pad others to the same length - ) - - - - - - (provide 'proof-indent) |