aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2009-02-04 07:45:09 +0000
committerKenichi Handa2009-02-04 07:45:09 +0000
commitc381cb8dccae6aff966af47771665ef046aad916 (patch)
treed11f9a32bac853af4685607ddd22715a3d741786
parent6510501067147f718abc89f48d3d40950c4a353e (diff)
downloademacs-c381cb8dccae6aff966af47771665ef046aad916.tar.gz
emacs-c381cb8dccae6aff966af47771665ef046aad916.zip
(select-safe-coding-system): Use
buffer-chars-modified-tick instead of buffer-modified-tick.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/international/mule-cmds.el4
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a15fca9ebd7..f2725d4b446 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -24,6 +24,9 @@
24 24
252009-02-04 Kenichi Handa <handa@m17n.org> 252009-02-04 Kenichi Handa <handa@m17n.org>
26 26
27 * international/mule-cmds.el (select-safe-coding-system): Use
28 buffer-chars-modified-tick instead of buffer-modified-tick.
29
27 * descr-text.el (describe-char): Check font-object by fontp. 30 * descr-text.el (describe-char): Check font-object by fontp.
28 31
29 * composite.el (compose-gstring-for-terminal): If a character is 32 * composite.el (compose-gstring-for-terminal): If a character is
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index cbed1e3659e..451ac39cbfa 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -975,7 +975,7 @@ It is highly recommended to fix it before writing to a file."
975 975
976 (let ((codings (find-coding-systems-region from to)) 976 (let ((codings (find-coding-systems-region from to))
977 (coding-system nil) 977 (coding-system nil)
978 (tick (if (not (stringp from)) (buffer-modified-tick))) 978 (tick (if (not (stringp from)) (buffer-chars-modified-tick)))
979 safe rejected unsafe) 979 safe rejected unsafe)
980 (if (eq (car codings) 'undecided) 980 (if (eq (car codings) 'undecided)
981 ;; Any coding system is ok. 981 ;; Any coding system is ok.
@@ -1041,7 +1041,7 @@ It is highly recommended to fix it before writing to a file."
1041%s specified by file contents. Really save (else edit coding cookies \ 1041%s specified by file contents. Really save (else edit coding cookies \
1042and try again)? " coding-system auto-cs)) 1042and try again)? " coding-system auto-cs))
1043 (error "Save aborted")))) 1043 (error "Save aborted"))))
1044 (when (and tick (/= tick (buffer-modified-tick))) 1044 (when (and tick (/= tick (buffer-chars-modified-tick)))
1045 (error "Cancelled because the buffer was modified")) 1045 (error "Cancelled because the buffer was modified"))
1046 coding-system))) 1046 coding-system)))
1047 1047