From ed4fd9c52765d5f0aa411eecd563143c38d547ba Mon Sep 17 00:00:00 2001
From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Tue, 6 Aug 2013 20:33:14 +0400
Subject: [PATCH] * lisp/files.el (cache-long-line-scans): Make obsolete alias
 to `cache-long-scans'. * etc/NEWS: Mention `cache-long-scans'.

---
 etc/ChangeLog  | 4 ++++
 etc/NEWS       | 4 ++++
 lisp/ChangeLog | 5 +++++
 lisp/files.el  | 4 +++-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 2d204f326b2..85a04f87f57 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-06  Dmitry Antipov  <dmantipov@yandex.ru>
+
+	* NEWS: Mention `cache-long-scans'.
+
 2013-08-05  Juanma Barranquero  <lekktu@gmail.com>
 
 	* tutorials/TUTORIAL.es: Fix typo (bug#15027).
diff --git a/etc/NEWS b/etc/NEWS
index 507cd04aa10..3682b6fc08b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -54,6 +54,10 @@ pkg-config is required to find ImageMagick libraries.
 ** Key ? also describes prefix bindings like C-h.
 
 +++
+** `cache-long-line-scans' has been renamed to `cache-long-scans'
+because it affects caching of paragraph scanning results as well.
+
++++
 ** `apropos-variable' is now `apropos-user-option'
 `apropos-user-option' shows all user options while `apropos-variable'
 shows all variables.  When called with a universal prefix argument,
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0843ca2398a..5f243b82e04 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-06  Dmitry Antipov  <dmantipov@yandex.ru>
+
+	* files.el (cache-long-line-scans): Make
+	obsolete alias to `cache-long-scans'.
+
 2013-08-06  Juanma Barranquero  <lekktu@gmail.com>
 
 	* frameset.el (frameset, frameset-filter-alist)
diff --git a/lisp/files.el b/lisp/files.el
index 526c535450b..efd89605b1b 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6690,7 +6690,9 @@ based on existing mode bits, as in \"og+rX-w\"."
 	  (string-to-number value 8)
 	(file-modes-symbolic-to-number value modes)))))
 
-
+(define-obsolete-variable-alias 'cache-long-line-scans
+  'cache-long-scans "24.4")
+
 ;; Trashcan handling.
 (defcustom trash-directory nil
   "Directory for `move-file-to-trash' to move files and directories to.
-- 
2.11.4.GIT