aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/net/rcirc.el9
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2aafbd758d7..c07c9627d1c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-12-11 Glenn Morris <rgm@gnu.org> 12012-12-11 Glenn Morris <rgm@gnu.org>
2 2
3 * net/rcirc.el (rcirc-urls, rcirc-condition-filter): Doc fixes.
4
3 * progmodes/f90.el (f90-line-continued, f90-indent-region): 5 * progmodes/f90.el (f90-line-continued, f90-indent-region):
4 Treat preprocessor lines embedded in continuations like comments. 6 Treat preprocessor lines embedded in continuations like comments.
5 (f90-indent-line): Special-case preprocessor lines. (Bug#13138) 7 (f90-indent-line): Special-case preprocessor lines. (Bug#13138)
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index fa5bc4a9822..16644b57549 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -406,8 +406,7 @@ will be killed."
406 "The channel or user associated with this buffer.") 406 "The channel or user associated with this buffer.")
407 407
408(defvar rcirc-urls nil 408(defvar rcirc-urls nil
409 "List of URLs seen in the current buffer and the position in 409 "List of URLs seen in the current buffer and their start positions.")
410the buffer where the URL starts.")
411(put 'rcirc-urls 'permanent-local t) 410(put 'rcirc-urls 'permanent-local t)
412 411
413(defvar rcirc-timeout-seconds 600 412(defvar rcirc-timeout-seconds 600
@@ -2393,9 +2392,11 @@ keywords when no KEYWORD is given."
2393 "\\)") 2392 "\\)")
2394 "Regexp matching URLs. Set to nil to disable URL features in rcirc.") 2393 "Regexp matching URLs. Set to nil to disable URL features in rcirc.")
2395 2394
2395;; cf cl-remove-if-not
2396(defun rcirc-condition-filter (condp lst) 2396(defun rcirc-condition-filter (condp lst)
2397 "Given a condition and a list, returns the list with elements 2397 "Remove all items not satisfying condition CONDP in list LST.
2398that do not satisfy the condition removed." 2398CONDP is a function that takes a list element as argument and returns
2399non-nil if that element should be included. Returns a new list."
2399 (delq nil (mapcar (lambda (x) (and (funcall condp x) x)) lst))) 2400 (delq nil (mapcar (lambda (x) (and (funcall condp x) x)) lst)))
2400 2401
2401(defun rcirc-browse-url (&optional arg) 2402(defun rcirc-browse-url (&optional arg)