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.

5 files changed, 60 insertions, 100 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f4963a07a9..9b43a2ab6e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-04  Chong Yidong  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* sort.el (delete-duplicate-lines): New command.  (Bug#13032)
diff --git a/lisp/longlines.el b/lisp/obsolete/longlines.el
index d249eaa658..d249eaa658 100644
--- a/lisp/longlines.el
+++ b/lisp/obsolete/longlines.el
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 9bf731fb6b..98383e5653 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-04  Chong Yidong  <[email protected]>
+
+	* org-bibtex.el (org-bibtex-ask): Use visual-line-mode instead of
+	longlines-mode.
+
 2012-10-26  Achim Gratz  <[email protected]>
 
 	* ob-ditaa.el: Needs to (require 'org-compat) for
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index f8e07adcd8..aaae8d52de 100644
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -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 @@ This variable is relevant only if `org-bibtex-export-tags-as-keywords' is t."
 	   (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))))))
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index 5b31e625a0..aa7c900720 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -453,52 +453,30 @@ one optional arguments, diff-number to refine.")
 		   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 @@ delimiter regions"))
 			 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