aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.7
diff options
context:
space:
mode:
authorJoakim Verona2010-10-18 22:05:07 +0200
committerJoakim Verona2010-10-18 22:05:07 +0200
commit13cfe8df462ab8da9f0028e16cc84dcaceaca3d1 (patch)
tree723f254768f9e503504ab4c8b68801f80a56591a /src/ChangeLog.7
parent35f4b80a934b299b3b18e62f5db44f64c240e65b (diff)
parente48eb34332dc91de823314090451459ba2ffacbf (diff)
downloademacs-13cfe8df462ab8da9f0028e16cc84dcaceaca3d1.tar.gz
emacs-13cfe8df462ab8da9f0028e16cc84dcaceaca3d1.zip
merge from upstream
Diffstat (limited to 'src/ChangeLog.7')
-rw-r--r--src/ChangeLog.76
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 6cc3d0f9e3e..b5927108808 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -491,7 +491,7 @@
491 491
492 * xselect.c (selection_data_to_lisp_data): Set 492 * xselect.c (selection_data_to_lisp_data): Set
493 Vlast_coding_system_used. 493 Vlast_coding_system_used.
494 (lisp_data_to_selection_data): Likewize. 494 (lisp_data_to_selection_data): Likesize.
495 495
4961998-07-07 Richard Stallman <rms@psilocin.ai.mit.edu> 4961998-07-07 Richard Stallman <rms@psilocin.ai.mit.edu>
497 497
@@ -502,7 +502,7 @@
502 * editfns.c (Fformat): Replace explicit numeric constants with 502 * editfns.c (Fformat): Replace explicit numeric constants with
503 proper macros. 503 proper macros.
504 504
505 * fns.c (concat): Likewize. 505 * fns.c (concat): Likewise.
506 506
5071998-07-06 Kenichi Handa <handa@etl.go.jp> 5071998-07-06 Kenichi Handa <handa@etl.go.jp>
508 508
@@ -1040,7 +1040,7 @@
1040 1040
1041 * lread.c: Remember the last TWO strings skipped with #@. 1041 * lread.c: Remember the last TWO strings skipped with #@.
1042 (prev_saved_doc_string*): New variables. 1042 (prev_saved_doc_string*): New variables.
1043 (Fload): Initalize prev_saved_doc_string. 1043 (Fload): Initialize prev_saved_doc_string.
1044 (read1): Copy saved_doc_string to prev_saved_doc_string 1044 (read1): Copy saved_doc_string to prev_saved_doc_string
1045 before storing a new string in saved_doc_string. 1045 before storing a new string in saved_doc_string.
1046 (read_list): Look in prev_saved_doc_string as well as 1046 (read_list): Look in prev_saved_doc_string as well as