aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/textmodes
diff options
context:
space:
mode:
authorStefan Monnier2019-06-26 10:24:59 -0400
committerStefan Monnier2019-06-26 10:24:59 -0400
commit0b4e003766f15225dede9bdba4ead33e493856e2 (patch)
tree99de57fe8feeca540f398acb232b75e9c802418c /lisp/textmodes
parent699fce296b13d7db386b1cb5cecf2710e5196691 (diff)
downloademacs-0b4e003766f15225dede9bdba4ead33e493856e2.tar.gz
emacs-0b4e003766f15225dede9bdba4ead33e493856e2.zip
Revert "* lisp/calc/calc-ext.el (math-scalarp): Fix typo"
This reverts commit 698ff554ac2699ec48fefc85a1307cbc4a183b0d.
Diffstat (limited to 'lisp/textmodes')
-rw-r--r--lisp/textmodes/css-mode.el2
-rw-r--r--lisp/textmodes/fill.el6
2 files changed, 1 insertions, 7 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 19e0039ea53..5d5d787945d 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1115,7 +1115,7 @@ to exclude some SCSS constructs."
1115 (goto-char start-point) 1115 (goto-char start-point)
1116 (forward-comment (- (point))) 1116 (forward-comment (- (point)))
1117 (skip-chars-backward "@[:alpha:]") 1117 (skip-chars-backward "@[:alpha:]")
1118 (unless (looking-at-p "@\\(?:mixin\\|include\\)") 1118 (unless (looking-at-p "@\\(mixin\\|include\\)")
1119 (cdr color))))) 1119 (cdr color)))))
1120 1120
1121(defun css--compute-color (start-point match) 1121(defun css--compute-color (start-point match)
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 7d951ff16e8..c285491a305 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -900,12 +900,6 @@ region, instead of just filling the current paragraph."
900 (equal hash (buffer-hash))) 900 (equal hash (buffer-hash)))
901 (set-buffer-modified-p nil))))) 901 (set-buffer-modified-p nil)))))
902 902
903(defun unfill-paragraph ()
904 "That thing."
905 (interactive)
906 (let ((fill-column (/ most-positive-fixnum 2)))
907 (fill-paragraph)))
908
909(declare-function comment-search-forward "newcomment" (limit &optional noerror)) 903(declare-function comment-search-forward "newcomment" (limit &optional noerror))
910(declare-function comment-string-strip "newcomment" (str beforep afterp)) 904(declare-function comment-string-strip "newcomment" (str beforep afterp))
911 905