Merge.

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 @@
+2011-10-28  Deniz Dogan  <deniz@dogan.se>
+
+        * net/rcirc.el (rcirc-mode): Use hard newlines.
+
 2011-10-28  Alan Mackenzie  <acm@muc.de>
 
         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.")
   (set (make-local-variable 'rcirc-recent-quit-alist) nil)
   (set (make-local-variable 'rcirc-current-line) 0)
 
+  (use-hard-newlines t)
   (set (make-local-variable 'rcirc-short-buffer-name) nil)
   (set (make-local-variable 'rcirc-urls) nil)