aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/tutorial.el
diff options
context:
space:
mode:
authorMiles Bader2007-05-20 23:29:14 +0000
committerMiles Bader2007-05-20 23:29:14 +0000
commit7be1c21aedb2f8e7b7831d494e065a31afe13146 (patch)
treea998f949002bf05307fe6b59969e6ebfb0c88b8d /lisp/tutorial.el
parent3c28868aeb2d445830019837294e96f432456754 (diff)
parent26114bc08f03789f30f0acca925955f2139df690 (diff)
downloademacs-7be1c21aedb2f8e7b7831d494e065a31afe13146.tar.gz
emacs-7be1c21aedb2f8e7b7831d494e065a31afe13146.zip
Merged from emacs--devo--0
Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-744 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-745 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-746 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-747 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-748 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-749 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-750 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-751 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-752 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-753 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-754 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-755 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-756 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-757 Update from CVS: lisp/textmodes/sgml-mode.el: Revert last change. * emacs@sv.gnu.org/emacs--devo--0--patch-758 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-759 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-760 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-761 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-14 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-15 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-16 Update from CVS: src/xterm.c (XTread_socket): Revert last change. * emacs@sv.gnu.org/emacs--rel--22--patch-17 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-18 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-19 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-20 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-21 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-221 Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-12 Creator: Karoly Lorentey <karoly@lorentey.hu>
Diffstat (limited to 'lisp/tutorial.el')
-rw-r--r--lisp/tutorial.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 8495f1db6d9..4856d178056 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -406,8 +406,8 @@ where
406 WHERE is a text describing the key sequences to which DEF-FUN is 406 WHERE is a text describing the key sequences to which DEF-FUN is
407 bound now (or, if it is remapped, a key sequence 407 bound now (or, if it is remapped, a key sequence
408 for the function it is remapped to) 408 for the function it is remapped to)
409 REMARK is a list with info about rebinding. It has either of these 409 REMARK is a list with info about rebinding. It has either of
410 formats: 410 these formats:
411 411
412 \(TEXT cua-mode) 412 \(TEXT cua-mode)
413 \(TEXT current-binding KEY-FUN DEF-FUN KEY WHERE) 413 \(TEXT current-binding KEY-FUN DEF-FUN KEY WHERE)
@@ -912,14 +912,14 @@ See `get-lang-string' for more information.")
912 912
913(defun get-lang-string (lang stringid &optional no-eng-fallback) 913(defun get-lang-string (lang stringid &optional no-eng-fallback)
914 "Get a language specific string for Emacs. 914 "Get a language specific string for Emacs.
915In certain places Emacs can replace a string showed to the user with a language specific string. 915In certain places Emacs can replace a string shown to the user with
916This function retrieves such strings. 916a language specific string. This function retrieves such strings.
917 917
918LANG is the language specification. It should be one of those 918LANG is the language specification. It should be one of those
919strings that can be returned by `read-language-name'. STRINGID 919strings that can be returned by `read-language-name'. STRINGID
920is a symbol that specifies the string to retrieve. 920is a symbol that specifies the string to retrieve.
921 921
922If no string is found for STRINGID in the choosen language then 922If no string is found for STRINGID in the chosen language then
923the English string is returned unless NO-ENG-FALLBACK is non-nil. 923the English string is returned unless NO-ENG-FALLBACK is non-nil.
924 924
925See `lang-strings' for more information. 925See `lang-strings' for more information.