aboutsummaryrefslogtreecommitdiffstats
path: root/src/doc.c
diff options
context:
space:
mode:
authorJim Blandy1992-03-14 19:09:32 +0000
committerJim Blandy1992-03-14 19:09:32 +0000
commit956ace37a8ec4df40a07940c08d5aa6d10e8b073 (patch)
tree47a79680bb2980f34271e67401a3c0f545045a51 /src/doc.c
parentfb955dfadd6fd6031b50561e184610c56f04a2cc (diff)
downloademacs-956ace37a8ec4df40a07940c08d5aa6d10e8b073.tar.gz
emacs-956ace37a8ec4df40a07940c08d5aa6d10e8b073.zip
*** empty log message ***
Diffstat (limited to 'src/doc.c')
-rw-r--r--src/doc.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/doc.c b/src/doc.c
index ee6c87d5231..a907118c9ea 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -1,5 +1,5 @@
1/* Record indices of function doc strings stored in a file. 1/* Record indices of function doc strings stored in a file.
2 Copyright (C) 1985, 1986 Free Software Foundation, Inc. 2 Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
@@ -174,19 +174,17 @@ subcommands.)");
174 return Fsignal (Qinvalid_function, Fcons (fun, Qnil)); 174 return Fsignal (Qinvalid_function, Fcons (fun, Qnil));
175 } 175 }
176 176
177 if (NULL (raw)) 177 if (NILP (raw))
178 doc = Fsubstitute_command_keys (doc); 178 doc = Fsubstitute_command_keys (doc);
179 return doc; 179 return doc;
180} 180}
181 181
182DEFUN ("documentation-property", Fdocumentation_property, 182DEFUN ("documentation-property", Fdocumentation_property, Sdocumentation_property, 2, 2, 0,
183 Sdocumentation_property, 2, 2, 0,
184
185 "Return the documentation string that is SYMBOL's PROP property.\n\ 183 "Return the documentation string that is SYMBOL's PROP property.\n\
186This is like `get', but it can refer to strings stored in the\n\ 184This is like `get', but it can refer to strings stored in the\n\
187`share-lib/DOC' file; and if the value is a string, it is passed through\n\ 185`share-lib/DOC' file; and if the value is a string, it is passed through\n\
188`substitute-command-keys'. A non-nil third argument avoids this 186`substitute-command-keys'. A non-nil third argument avoids this\n\
189translation." 187translation.")
190 (sym, prop, raw) 188 (sym, prop, raw)
191 Lisp_Object sym, prop, raw; 189 Lisp_Object sym, prop, raw;
192{ 190{
@@ -195,7 +193,7 @@ translation."
195 tem = Fget (sym, prop); 193 tem = Fget (sym, prop);
196 if (XTYPE (tem) == Lisp_Int) 194 if (XTYPE (tem) == Lisp_Int)
197 tem = get_doc_string (XINT (tem) > 0 ? XINT (tem) : - XINT (tem)); 195 tem = get_doc_string (XINT (tem) > 0 ? XINT (tem) : - XINT (tem));
198 if (NULL (raw) && XTYPE (tem) == Lisp_String) 196 if (NILP (raw) && XTYPE (tem) == Lisp_String)
199 return Fsubstitute_command_keys (tem); 197 return Fsubstitute_command_keys (tem);
200 return tem; 198 return tem;
201} 199}