aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeniz Dogan2011-10-28 16:47:50 +0200
committerDeniz Dogan2011-10-28 16:47:50 +0200
commit1a2ce9ee38c720f26189cc5e17d56309e6dbb76b (patch)
tree98a5f2922b6d32b54bec53f1b37e12268667f471
parent31b39d1389640fa5677c8f86a2944a1197f4ada8 (diff)
downloademacs-1a2ce9ee38c720f26189cc5e17d56309e6dbb76b.tar.gz
emacs-1a2ce9ee38c720f26189cc5e17d56309e6dbb76b.zip
* net/rcirc.el (rcirc-mode): Use hard newlines.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/rcirc.el1
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf4d87d3405..4ac4419b163 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-10-28 Deniz Dogan <deniz@dogan.se>
2
3 * net/rcirc.el (rcirc-mode): Use hard newlines.
4
12011-10-28 Alan Mackenzie <acm@muc.de> 52011-10-28 Alan Mackenzie <acm@muc.de>
2 6
3 Amend to indent and fontify macros "which include their own semicolon" 7 Amend to indent and fontify macros "which include their own semicolon"
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 6a912cd6273..f6981aeabd9 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -979,6 +979,7 @@ This number is independent of the number of lines in the buffer.")
979 (set (make-local-variable 'rcirc-recent-quit-alist) nil) 979 (set (make-local-variable 'rcirc-recent-quit-alist) nil)
980 (set (make-local-variable 'rcirc-current-line) 0) 980 (set (make-local-variable 'rcirc-current-line) 0)
981 981
982 (use-hard-newlines t)
982 (set (make-local-variable 'rcirc-short-buffer-name) nil) 983 (set (make-local-variable 'rcirc-short-buffer-name) nil)
983 (set (make-local-variable 'rcirc-urls) nil) 984 (set (make-local-variable 'rcirc-urls) nil)
984 985