aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-01-22 13:02:49 -0800
committerGlenn Morris2011-01-22 13:02:49 -0800
commitce5582082cda8eb30f4deba6ae524c1a57b6b5fd (patch)
treec171bb529a1ed839e023a134d48fed0ea29386ce
parentd647640760eedb9dc1fe8d1ce77edea97506dc1a (diff)
downloademacs-ce5582082cda8eb30f4deba6ae524c1a57b6b5fd.tar.gz
emacs-ce5582082cda8eb30f4deba6ae524c1a57b6b5fd.zip
* lisp/simple.el (do-auto-fill): Give it a doc string.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/simple.el15
2 files changed, 8 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 789d646f6d0..acf25f155db 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,8 @@
5 5
62011-01-22 Glenn Morris <rgm@gnu.org> 62011-01-22 Glenn Morris <rgm@gnu.org>
7 7
8 * simple.el (do-auto-fill): Give it a doc string.
9
8 * button.el (make-text-button): Doc fix. (See bug#7881) 10 * button.el (make-text-button): Doc fix. (See bug#7881)
9 11
102011-01-22 Chong Yidong <cyd@stupidchicken.com> 122011-01-22 Chong Yidong <cyd@stupidchicken.com>
diff --git a/lisp/simple.el b/lisp/simple.el
index 4d3a46cb813..d267089214c 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1,8 +1,8 @@
1;;; simple.el --- basic editing commands for Emacs 1;;; simple.el --- basic editing commands for Emacs
2 2
3;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998,
4;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 4;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
5;; Free Software Foundation, Inc. 5;; 2010, 2011 Free Software Foundation, Inc.
6 6
7;; Maintainer: FSF 7;; Maintainer: FSF
8;; Keywords: internal 8;; Keywords: internal
@@ -5007,12 +5007,10 @@ If optional arg REALLY-WORD is non-nil, it finds just a word."
5007 regexp) 5007 regexp)
5008 :group 'fill) 5008 :group 'fill)
5009 5009
5010;; This function is used as the auto-fill-function of a buffer
5011;; when Auto-Fill mode is enabled.
5012;; It returns t if it really did any work.
5013;; (Actually some major modes use a different auto-fill function,
5014;; but this one is the default one.)
5015(defun do-auto-fill () 5010(defun do-auto-fill ()
5011 "The default value for `normal-auto-fill-function'.
5012This is the default auto-fill function, some major modes use a different one.
5013Returns t if it really did any work."
5016 (let (fc justify give-up 5014 (let (fc justify give-up
5017 (fill-prefix fill-prefix)) 5015 (fill-prefix fill-prefix))
5018 (if (or (not (setq justify (current-justification))) 5016 (if (or (not (setq justify (current-justification)))
@@ -6666,5 +6664,4 @@ warning using STRING as the message.")
6666 6664
6667(provide 'simple) 6665(provide 'simple)
6668 6666
6669;; arch-tag: 24af67c0-2a49-44f6-b3b1-312d8b570dfd
6670;;; simple.el ends here 6667;;; simple.el ends here