aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/NEWS2
-rw-r--r--lisp/calc/calccomp.el2
-rw-r--r--lisp/woman.el2
-rw-r--r--src/ChangeLog3
-rw-r--r--src/Makefile.in2
-rw-r--r--src/w32.c4
-rw-r--r--src/xdisp.c2
7 files changed, 10 insertions, 7 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 13355abe4c4..3c2857f3a8c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -23,7 +23,7 @@ so we will look at it and add it to the manual.
23 23
24* Installation Changes in Emacs 24.3 24* Installation Changes in Emacs 24.3
25 25
26** New configure option '--without-all' to disable additonal features. 26** New configure option '--without-all' to disable additional features.
27This disables most of the features that are normally enabled by default. 27This disables most of the features that are normally enabled by default.
28 28
29** New configure option '--enable-link-time-optimization' to utilize 29** New configure option '--enable-link-time-optimization' to utilize
diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el
index 51ea8e7b7a3..2f1c95b7668 100644
--- a/lisp/calc/calccomp.el
+++ b/lisp/calc/calccomp.el
@@ -86,7 +86,7 @@
86 (setq sn (math-to-underscores sn))) 86 (setq sn (math-to-underscores sn)))
87 sn))) 87 sn)))
88 88
89;;; Give multiplication precendence when composing to avoid 89;;; Give multiplication precedence when composing to avoid
90;;; writing a*(b c) instead of a b c 90;;; writing a*(b c) instead of a b c
91(defun math-compose-expr (a prec &optional div) 91(defun math-compose-expr (a prec &optional div)
92 (let ((calc-multiplication-has-precedence t) 92 (let ((calc-multiplication-has-precedence t)
diff --git a/lisp/woman.el b/lisp/woman.el
index 5933d593aa5..c8cc7ea6766 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -2531,7 +2531,7 @@ REQUEST is the invoking directive without the leading dot."
2531 (cond 2531 (cond
2532 ;; ((looking-at "[no]") (setq c t)) ; accept n(roff) and o(dd page) 2532 ;; ((looking-at "[no]") (setq c t)) ; accept n(roff) and o(dd page)
2533 ;; ((looking-at "[te]") (setq c nil)) ; reject t(roff) and e(ven page) 2533 ;; ((looking-at "[te]") (setq c nil)) ; reject t(roff) and e(ven page)
2534 ;; Per groff ".if v" is recognised as false (it means -Tversatec). 2534 ;; Per groff ".if v" is recognized as false (it means -Tversatec).
2535 ((looking-at "[ntoev]") 2535 ((looking-at "[ntoev]")
2536 (setq c (memq (following-char) woman-if-conditions-true))) 2536 (setq c (memq (following-char) woman-if-conditions-true)))
2537 ;; Unrecognized letter so reject: 2537 ;; Unrecognized letter so reject:
diff --git a/src/ChangeLog b/src/ChangeLog
index 21aec9cb3c5..550d2774ad4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12012-08-26 Paul Eggert <eggert@cs.ucla.edu> 12012-08-26 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Spelling fixes.
4 * Makefile.in (.PHONY): versioclean -> versionclean.
5
3 Remove unused external symbols. 6 Remove unused external symbols.
4 * data.c (Qcons, Qfloat, Qmisc, Qstring, Qvector): 7 * data.c (Qcons, Qfloat, Qmisc, Qstring, Qvector):
5 * window.c (Qwindow_valid_p, decode_valid_window): 8 * window.c (Qwindow_valid_p, decode_valid_window):
diff --git a/src/Makefile.in b/src/Makefile.in
index 85645222052..60df1f1c677 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -502,7 +502,7 @@ doc.o: buildobj.h
502@ns_frag@ 502@ns_frag@
503 503
504.PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean 504.PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean
505.PHONY: versioclean extraclean frc 505.PHONY: versionclean extraclean frc
506 506
507mostlyclean: 507mostlyclean:
508 rm -f temacs$(EXEEXT) core *.core \#* *.o libXMenu11.a liblw.a 508 rm -f temacs$(EXEEXT) core *.core \#* *.o libXMenu11.a liblw.a
diff --git a/src/w32.c b/src/w32.c
index b460660cb8c..84a46e522bb 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -4098,7 +4098,7 @@ symlink (char const *filename, char const *linkname)
4098 dir_access = sys_access (filename, D_OK); 4098 dir_access = sys_access (filename, D_OK);
4099 4099
4100 /* Since Windows distinguishes between symlinks to directories and 4100 /* Since Windows distinguishes between symlinks to directories and
4101 to files, we provide a kludgey feature: if FILENAME doesn't 4101 to files, we provide a kludgy feature: if FILENAME doesn't
4102 exist, but ends in a slash, we create a symlink to directory. If 4102 exist, but ends in a slash, we create a symlink to directory. If
4103 FILENAME exists and is a directory, we always create a symlink to 4103 FILENAME exists and is a directory, we always create a symlink to
4104 directory. */ 4104 directory. */
@@ -4165,7 +4165,7 @@ symlink (char const *filename, char const *linkname)
4165 whether the underlying volume actually supports symlinks, by 4165 whether the underlying volume actually supports symlinks, by
4166 testing the FILE_SUPPORTS_REPARSE_POINTS bit in volume's flags, and 4166 testing the FILE_SUPPORTS_REPARSE_POINTS bit in volume's flags, and
4167 avoid the call to this function if it doesn't. That's because the 4167 avoid the call to this function if it doesn't. That's because the
4168 call to GetFileAttributes takes a non-negligible time, expecially 4168 call to GetFileAttributes takes a non-negligible time, especially
4169 on non-local or removable filesystems. See stat_worker for an 4169 on non-local or removable filesystems. See stat_worker for an
4170 example of how to do that. */ 4170 example of how to do that. */
4171static int 4171static int
diff --git a/src/xdisp.c b/src/xdisp.c
index f5edb4b16f8..18e537e9385 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2420,7 +2420,7 @@ remember_mouse_glyph (struct frame *f, int gx, int gy, NativeRectangle *rect)
2420static Lisp_Object 2420static Lisp_Object
2421safe_eval_handler (Lisp_Object arg, ptrdiff_t nargs, Lisp_Object *args) 2421safe_eval_handler (Lisp_Object arg, ptrdiff_t nargs, Lisp_Object *args)
2422{ 2422{
2423 add_to_log ("Error during redisplay: %S signalled %S", 2423 add_to_log ("Error during redisplay: %S signaled %S",
2424 Flist (nargs, args), arg); 2424 Flist (nargs, args), arg);
2425 return Qnil; 2425 return Qnil;
2426} 2426}