[Emacs-diffs] /srv/bzr/emacs/trunk r111084: Obsolete longlines.el.

[Chong Yidong]

------------------------------------------------------------
revno: 111084
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-12-04 10:47:43 +0800
message:
  Obsolete longlines.el.
  
  * longlines.el: Move to obsolete/.
  
  * lisp/org/org-bibtex.el (org-bibtex-ask): Use visual-line-mode instead of
  longlines-mode.
  
  * lisp/vc/ediff-diff.el (ediff-extract-diffs, ediff-extract-diffs3):
  Remove code referring to longlines mode.
renamed:
  lisp/longlines.el => lisp/obsolete/longlines.el
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/org/ChangeLog
  lisp/org/org-bibtex.el
  lisp/vc/ediff-diff.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-12-03 23:49:08 +0000
+++ b/etc/NEWS  2012-12-04 02:47:43 +0000
@@ -79,6 +79,10 @@
 *** The commands `woman-default-faces' and `woman-monochrome-faces'
 are obsolete.  Customize the `woman-* faces instead.
 
+** Obsolete packages:
+
+*** longlines.el is obsolete; use visual-line-mode instead.
+
 
 * New Modes and Packages in Emacs 24.4
 ** New nadvice.el package offering lighter-weight advice facilities.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-03 23:49:08 +0000
+++ b/lisp/ChangeLog    2012-12-04 02:47:43 +0000
@@ -1,3 +1,10 @@
+2012-12-04  Chong Yidong  <address@hidden>
+
+       * longlines.el: Move to obsolete/.
+
+       * vc/ediff-diff.el (ediff-extract-diffs, ediff-extract-diffs3):
+       Remove code referring to longlines mode.
+
 2012-12-03  Juri Linkov  <address@hidden>
 
        * sort.el (delete-duplicate-lines): New command.  (Bug#13032)

=== renamed file 'lisp/longlines.el' => 'lisp/obsolete/longlines.el'
=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2012-10-26 14:42:05 +0000
+++ b/lisp/org/ChangeLog        2012-12-04 02:47:43 +0000
@@ -1,3 +1,8 @@
+2012-12-04  Chong Yidong  <address@hidden>
+
+       * org-bibtex.el (org-bibtex-ask): Use visual-line-mode instead of
+       longlines-mode.
+
 2012-10-26  Achim Gratz  <address@hidden>
 
        * ob-ditaa.el: Needs to (require 'org-compat) for

=== modified file 'lisp/org/org-bibtex.el'
--- a/lisp/org/org-bibtex.el    2012-09-30 15:14:59 +0000
+++ b/lisp/org/org-bibtex.el    2012-12-04 02:47:43 +0000
@@ -120,7 +120,6 @@
 (declare-function bibtex-generate-autokey "bibtex" ())
 (declare-function bibtex-parse-entry "bibtex" (&optional content))
 (declare-function bibtex-url "bibtex" (&optional pos no-browse))
-(declare-function longlines-mode "longlines" (&optional arg))
 (declare-function org-babel-trim "ob" (string &optional regexp))
 
 
@@ -381,7 +380,7 @@
           (buf-name (format "*Bibtex Help %s*" name)))
       (with-output-to-temp-buffer buf-name
        (princ (cdr (assoc field org-bibtex-fields))))
-      (with-current-buffer buf-name (longlines-mode t))
+      (with-current-buffer buf-name (visual-line-mode 1))
       (org-fit-window-to-buffer (get-buffer-window buf-name))
       ((lambda (result) (when (> (length result) 0) result))
        (read-from-minibuffer (format "%s: " name))))))

=== modified file 'lisp/vc/ediff-diff.el'
--- a/lisp/vc/ediff-diff.el     2012-07-16 10:19:56 +0000
+++ b/lisp/vc/ediff-diff.el     2012-12-04 02:47:43 +0000
@@ -453,52 +453,30 @@
                   c-prev c-end)
           ;; else convert lines to points
           (ediff-with-current-buffer A-buffer
-            (let ((longlines-mode-val
-                   (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
-              ;; we must disable and then restore longlines-mode
-              (if (eq longlines-mode-val 1)
-                  (longlines-mode 0))
-              (goto-char (or a-prev-pt shift-A (point-min)))
-              (forward-line (- a-begin a-prev))
-              (setq a-begin-pt (point))
-              (forward-line (- a-end a-begin))
-              (setq a-end-pt (point)
-                    a-prev a-end
-                    a-prev-pt a-end-pt)
-              (if (eq longlines-mode-val 1)
-                  (longlines-mode longlines-mode-val))
-              ))
+            (goto-char (or a-prev-pt shift-A (point-min)))
+            (forward-line (- a-begin a-prev))
+            (setq a-begin-pt (point))
+            (forward-line (- a-end a-begin))
+            (setq a-end-pt (point)
+                  a-prev a-end
+                  a-prev-pt a-end-pt))
           (ediff-with-current-buffer B-buffer
-            (let ((longlines-mode-val
-                   (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
-              (if (eq longlines-mode-val 1)
-                  (longlines-mode 0))
-              (goto-char (or b-prev-pt shift-B (point-min)))
-              (forward-line (- b-begin b-prev))
-              (setq b-begin-pt (point))
-              (forward-line (- b-end b-begin))
-              (setq b-end-pt (point)
-                    b-prev b-end
-                    b-prev-pt b-end-pt)
-              (if (eq longlines-mode-val 1)
-                  (longlines-mode longlines-mode-val))
-              ))
+            (goto-char (or b-prev-pt shift-B (point-min)))
+            (forward-line (- b-begin b-prev))
+            (setq b-begin-pt (point))
+            (forward-line (- b-end b-begin))
+            (setq b-end-pt (point)
+                  b-prev b-end
+                  b-prev-pt b-end-pt))
           (if (ediff-buffer-live-p C-buffer)
               (ediff-with-current-buffer C-buffer
-                (let ((longlines-mode-val
-                       (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
-                  (if (eq longlines-mode-val 1)
-                      (longlines-mode 0))
-                  (goto-char (or c-prev-pt (point-min)))
-                  (forward-line (- c-begin c-prev))
-                  (setq c-begin-pt (point))
-                  (forward-line (- c-end c-begin))
-                  (setq c-end-pt (point)
-                        c-prev c-end
-                        c-prev-pt c-end-pt)
-                  (if (eq longlines-mode-val 1)
-                      (longlines-mode longlines-mode-val))
-                )))
+                (goto-char (or c-prev-pt (point-min)))
+                (forward-line (- c-begin c-prev))
+                (setq c-begin-pt (point))
+                (forward-line (- c-end c-begin))
+                (setq c-end-pt (point)
+                      c-prev c-end
+                      c-prev-pt c-end-pt)))
           (setq diff-list
                 (nconc
                  diff-list
@@ -1085,65 +1063,36 @@
                         c-prev c-end)
                 ;; else convert lines to points
                 (ediff-with-current-buffer A-buffer
-                  (let ((longlines-mode-val
-                         (if (and (boundp 'longlines-mode) longlines-mode) 1 
0)))
-                    ;; we must disable and then restore longlines-mode
-                    (if (eq longlines-mode-val 1)
-                        (longlines-mode 0))
-                    (goto-char (or a-prev-pt shift-A (point-min)))
-                    (forward-line (- a-begin a-prev))
-                    (setq a-begin-pt (point))
-                    (forward-line (- a-end a-begin))
-                    (setq a-end-pt (point)
-                          a-prev a-end
-                          a-prev-pt a-end-pt)
-                    (if (eq longlines-mode-val 1)
-                        (longlines-mode longlines-mode-val))
-                    ))
+                  (goto-char (or a-prev-pt shift-A (point-min)))
+                  (forward-line (- a-begin a-prev))
+                  (setq a-begin-pt (point))
+                  (forward-line (- a-end a-begin))
+                  (setq a-end-pt (point)
+                        a-prev a-end
+                        a-prev-pt a-end-pt))
                 (ediff-with-current-buffer B-buffer
-                  (let ((longlines-mode-val
-                         (if (and (boundp 'longlines-mode) longlines-mode) 1 
0)))
-                    (if (eq longlines-mode-val 1)
-                        (longlines-mode 0))
-                    (goto-char (or b-prev-pt shift-B (point-min)))
-                    (forward-line (- b-begin b-prev))
-                    (setq b-begin-pt (point))
-                    (forward-line (- b-end b-begin))
-                    (setq b-end-pt (point)
-                          b-prev b-end
-                          b-prev-pt b-end-pt)
-                    (if (eq longlines-mode-val 1)
-                        (longlines-mode longlines-mode-val))
-                    ))
+                  (goto-char (or b-prev-pt shift-B (point-min)))
+                  (forward-line (- b-begin b-prev))
+                  (setq b-begin-pt (point))
+                  (forward-line (- b-end b-begin))
+                  (setq b-end-pt (point)
+                        b-prev b-end
+                        b-prev-pt b-end-pt))
                 (ediff-with-current-buffer C-buffer
-                  (let ((longlines-mode-val
-                         (if (and (boundp 'longlines-mode) longlines-mode) 1 
0)))
-                    (if (eq longlines-mode-val 1)
-                        (longlines-mode 0))
-                    (goto-char (or c-prev-pt shift-C (point-min)))
-                    (forward-line (- c-begin c-prev))
-                    (setq c-begin-pt (point))
-                    (forward-line (- c-end c-begin))
-                    (setq c-end-pt (point)
-                          c-prev c-end
-                          c-prev-pt c-end-pt)
-                    (if (eq longlines-mode-val 1)
-                        (longlines-mode longlines-mode-val))
-                    ))
+                  (goto-char (or c-prev-pt shift-C (point-min)))
+                  (forward-line (- c-begin c-prev))
+                  (setq c-begin-pt (point))
+                  (forward-line (- c-end c-begin))
+                  (setq c-end-pt (point)
+                        c-prev c-end
+                        c-prev-pt c-end-pt))
                 (if (ediff-buffer-live-p anc-buffer)
                     (ediff-with-current-buffer anc-buffer
-                      (let ((longlines-mode-val
-                             (if (and (boundp 'longlines-mode) longlines-mode) 
1 0)))
-                        (if (eq longlines-mode-val 1)
-                            (longlines-mode 0))
-                        (forward-line (- c-or-anc-begin anc-prev))
-                        (setq anc-begin-pt (point))
-                        (forward-line (- c-or-anc-end c-or-anc-begin))
-                        (setq anc-end-pt (point)
-                              anc-prev c-or-anc-end)
-                        (if (eq longlines-mode-val 1)
-                            (longlines-mode longlines-mode-val))
-                        )))
+                      (forward-line (- c-or-anc-begin anc-prev))
+                      (setq anc-begin-pt (point))
+                      (forward-line (- c-or-anc-end c-or-anc-begin))
+                      (setq anc-end-pt (point)
+                            anc-prev c-or-anc-end)))
                 (setq diff-list
                       (nconc
                        diff-list