emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] scratch/gnus-cloud 3ae2fbf 35/61: Merge branch 'master' of


From: Teodor Zlatanov
Subject: [Emacs-diffs] scratch/gnus-cloud 3ae2fbf 35/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Fri, 1 Jul 2016 17:37:54 +0000 (UTC)

branch: scratch/gnus-cloud
commit 3ae2fbfcde212e573f9bcadd08e6c01f6056f911
Merge: b66705b 0214011
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 lisp/hilit-chg.el |    2 +-
 lisp/subr.el      |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index 6420b8c..1e4deb9 100644
--- a/lisp/hilit-chg.el
+++ b/lisp/hilit-chg.el
@@ -777,7 +777,7 @@ is non-nil."
           a-start a-end len-a
           b-start b-end len-b
           (bufa-modified (buffer-modified-p buf-a))
-          (bufb-modified (buffer-modified-p buf-b))
+          (bufb-modified (and (not (eq buf-a buf-b)) (buffer-modified-p 
buf-b)))
           (buf-a-read-only (with-current-buffer buf-a buffer-read-only))
           (buf-b-read-only (with-current-buffer buf-b buffer-read-only))
           temp-a temp-b)
diff --git a/lisp/subr.el b/lisp/subr.el
index 48ff501..27b1c8a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1300,6 +1300,12 @@ be a list of the form returned by `event-start' and 
`event-end'."
 (make-obsolete 'forward-point "use (+ (point) N) instead." "23.1")
 (make-obsolete 'buffer-has-markers-at nil "24.3")
 
+;; bug#23850
+(make-obsolete 'string-to-unibyte   "use `encode-coding-string'." "25.2")
+(make-obsolete 'string-as-unibyte   "use `encode-coding-string'." "25.2")
+(make-obsolete 'string-to-multibyte "use `decode-coding-string'." "25.2")
+(make-obsolete 'string-as-multibyte "use `decode-coding-string'." "25.2")
+
 (defun insert-string (&rest args)
   "Mocklisp-compatibility insert function.
 Like the function `insert' except that any argument that is a number



reply via email to

[Prev in Thread] Current Thread [Next in Thread]