aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2008-11-25 01:30:22 +0000
committerJay Belanger2008-11-25 01:30:22 +0000
commitbe5255e21c0e8a8cb49d01477d126c7ab745572b (patch)
treedbb320d013fbaa1c29dd6fcbd587160f9f140723
parenta1ff7705dcd0f6d010ab356b562850c4abb1b998 (diff)
downloademacs-be5255e21c0e8a8cb49d01477d126c7ab745572b.tar.gz
emacs-be5255e21c0e8a8cb49d01477d126c7ab745572b.zip
(calc-settings-file, calc-language-alist)
calc-embedded-announce-formula, calc-embedded-announce-formula-alist) calc-embedded-open-formula, calc-embedded-close-formula) calc-embedded-open-close-formula-alist) calc-embedded-word-regexp-alist, calc-embedded-open-plain) calc-embedded-close-plain, calc-embedded-open-close-plain-alist) calc-embedded-open-new-formula, calc-embedded-close-new-formula) calc-embedded-open-close-new-formula-alist, calc-embedded-open-mode) calc-embedded-close-mode, calc-embedded-open-close-mode-alist) calc-gnuplot-name, calc-gnuplot-plot-command) calc-gnuplot-print-command, calc-multiplication-has-precedence): Remove unnecessary asterisks from docstrings.
-rw-r--r--lisp/ChangeLog17
-rw-r--r--lisp/calc/calc.el42
2 files changed, 38 insertions, 21 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6063ff945b0..5e8a6917d55 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
12008-11-25 Jay Belanger <jay.p.belanger@gmail.com>
2
3 * calc/calc.el (calc-settings-file, calc-language-alist)
4 (calc-embedded-announce-formula)
5 (calc-embedded-announce-formula-alist)
6 (calc-embedded-open-formula, calc-embedded-close-formula)
7 (calc-embedded-open-close-formula-alist)
8 (calc-embedded-word-regexp-alist, calc-embedded-open-plain)
9 (calc-embedded-close-plain, calc-embedded-open-close-plain-alist)
10 (calc-embedded-open-new-formula, calc-embedded-close-new-formula)
11 (calc-embedded-open-close-new-formula-alist)
12 (calc-embedded-open-mode, calc-embedded-close-mode)
13 (calc-embedded-open-close-mode-alist, calc-gnuplot-name)
14 (calc-gnuplot-plot-command, calc-gnuplot-print-command)
15 (calc-multiplication-has-precedence): Remove unnecessary asterisks
16 from docstrings.
17
12008-11-25 Juanma Barranquero <lekktu@gmail.com> 182008-11-25 Juanma Barranquero <lekktu@gmail.com>
2 19
3 * calculator.el (calculator-op-or-exp): Reflow docstring. 20 * calculator.el (calculator-op-or-exp): Reflow docstring.
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 395ac8fe975..4a6dc9a76b6 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -230,7 +230,7 @@
230;;;###autoload 230;;;###autoload
231(defcustom calc-settings-file 231(defcustom calc-settings-file
232 (convert-standard-filename "~/.calc.el") 232 (convert-standard-filename "~/.calc.el")
233 "*File in which to record permanent settings." 233 "File in which to record permanent settings."
234 :group 'calc 234 :group 'calc
235 :type '(file)) 235 :type '(file))
236 236
@@ -246,14 +246,14 @@
246 (fortran-mode . fortran) 246 (fortran-mode . fortran)
247 (f90-mode . fortran) 247 (f90-mode . fortran)
248 (texinfo-mode . calc-normal-language)) 248 (texinfo-mode . calc-normal-language))
249 "*Alist of major modes with appropriate Calc languages." 249 "Alist of major modes with appropriate Calc languages."
250 :group 'calc 250 :group 'calc
251 :type '(alist :key-type (symbol :tag "Major mode") 251 :type '(alist :key-type (symbol :tag "Major mode")
252 :value-type (symbol :tag "Calc language"))) 252 :value-type (symbol :tag "Calc language")))
253 253
254(defcustom calc-embedded-announce-formula 254(defcustom calc-embedded-announce-formula
255 "%Embed\n\\(% .*\n\\)*" 255 "%Embed\n\\(% .*\n\\)*"
256 "*A regular expression which is sure to be followed by a calc-embedded formula." 256 "A regular expression which is sure to be followed by a calc-embedded formula."
257 :group 'calc 257 :group 'calc
258 :type '(regexp)) 258 :type '(regexp))
259 259
@@ -269,26 +269,26 @@
269 (sgml-mode . "<!-- Embed -->\n\\(<!-- .* -->\n\\)*") 269 (sgml-mode . "<!-- Embed -->\n\\(<!-- .* -->\n\\)*")
270 (xml-mode . "<!-- Embed -->\n\\(<!-- .* -->\n\\)*") 270 (xml-mode . "<!-- Embed -->\n\\(<!-- .* -->\n\\)*")
271 (texinfo-mode . "@c Embed\n\\(@c .*\n\\)*")) 271 (texinfo-mode . "@c Embed\n\\(@c .*\n\\)*"))
272 "*Alist of major modes with appropriate values for `calc-embedded-announce-formula'." 272 "Alist of major modes with appropriate values for `calc-embedded-announce-formula'."
273 :group 'calc 273 :group 'calc
274 :type '(alist :key-type (symbol :tag "Major mode") 274 :type '(alist :key-type (symbol :tag "Major mode")
275 :value-type (regexp :tag "Regexp to announce formula"))) 275 :value-type (regexp :tag "Regexp to announce formula")))
276 276
277(defcustom calc-embedded-open-formula 277(defcustom calc-embedded-open-formula
278 "\\`\\|^\n\\|\\$\\$?\\|\\\\\\[\\|^\\\\begin[^{].*\n\\|^\\\\begin{.*[^x]}.*\n\\|^@.*\n\\|^\\.EQ.*\n\\|\\\\(\\|^%\n\\|^\\.\\\\\"\n" 278 "\\`\\|^\n\\|\\$\\$?\\|\\\\\\[\\|^\\\\begin[^{].*\n\\|^\\\\begin{.*[^x]}.*\n\\|^@.*\n\\|^\\.EQ.*\n\\|\\\\(\\|^%\n\\|^\\.\\\\\"\n"
279 "*A regular expression for the opening delimiter of a formula used by calc-embedded." 279 "A regular expression for the opening delimiter of a formula used by calc-embedded."
280 :group 'calc 280 :group 'calc
281 :type '(regexp)) 281 :type '(regexp))
282 282
283(defcustom calc-embedded-close-formula 283(defcustom calc-embedded-close-formula
284 "\\'\\|\n$\\|\\$\\$?\\|\\\\]\\|^\\\\end[^{].*\n\\|^\\\\end{.*[^x]}.*\n\\|^@.*\n\\|^\\.EN.*\n\\|\\\\)\\|\n%\n\\|^\\.\\\\\"\n" 284 "\\'\\|\n$\\|\\$\\$?\\|\\\\]\\|^\\\\end[^{].*\n\\|^\\\\end{.*[^x]}.*\n\\|^@.*\n\\|^\\.EN.*\n\\|\\\\)\\|\n%\n\\|^\\.\\\\\"\n"
285 "*A regular expression for the closing delimiter of a formula used by calc-embedded." 285 "A regular expression for the closing delimiter of a formula used by calc-embedded."
286 :group 'calc 286 :group 'calc
287 :type '(regexp)) 287 :type '(regexp))
288 288
289(defcustom calc-embedded-open-close-formula-alist 289(defcustom calc-embedded-open-close-formula-alist
290 nil 290 nil
291 "*Alist of major modes with pairs of formula delimiters used by calc-embedded." 291 "Alist of major modes with pairs of formula delimiters used by calc-embedded."
292 :group 'calc 292 :group 'calc
293 :type '(alist :key-type (symbol :tag "Major mode") 293 :type '(alist :key-type (symbol :tag "Major mode")
294 :value-type (list (regexp :tag "Opening formula delimiter") 294 :value-type (list (regexp :tag "Opening formula delimiter")
@@ -302,14 +302,14 @@
302 302
303(defcustom calc-embedded-word-regexp-alist 303(defcustom calc-embedded-word-regexp-alist
304 nil 304 nil
305 "*Alist of major modes with word regexps used by calc-embedded-word." 305 "Alist of major modes with word regexps used by calc-embedded-word."
306 :group 'calc 306 :group 'calc
307 :type '(alist :key-type (symbol :tag "Major mode") 307 :type '(alist :key-type (symbol :tag "Major mode")
308 :value-type (regexp :tag "Regexp for word"))) 308 :value-type (regexp :tag "Regexp for word")))
309 309
310(defcustom calc-embedded-open-plain 310(defcustom calc-embedded-open-plain
311 "%%% " 311 "%%% "
312 "*A string which is the opening delimiter for a \"plain\" formula. 312 "A string which is the opening delimiter for a \"plain\" formula.
313If calc-show-plain mode is enabled, this is inserted at the front of 313If calc-show-plain mode is enabled, this is inserted at the front of
314each formula." 314each formula."
315 :group 'calc 315 :group 'calc
@@ -317,7 +317,7 @@ each formula."
317 317
318(defcustom calc-embedded-close-plain 318(defcustom calc-embedded-close-plain
319 " %%%\n" 319 " %%%\n"
320 "*A string which is the closing delimiter for a \"plain\" formula. 320 "A string which is the closing delimiter for a \"plain\" formula.
321See calc-embedded-open-plain." 321See calc-embedded-open-plain."
322 :group 'calc 322 :group 'calc
323 :type '(string)) 323 :type '(string))
@@ -334,7 +334,7 @@ See calc-embedded-open-plain."
334 (sgml-mode "<!-- %% " " %% -->\n") 334 (sgml-mode "<!-- %% " " %% -->\n")
335 (xml-mode "<!-- %% " " %% -->\n") 335 (xml-mode "<!-- %% " " %% -->\n")
336 (texinfo-mode "@c %% " " %%\n")) 336 (texinfo-mode "@c %% " " %%\n"))
337 "*Alist of major modes with pairs of delimiters for \"plain\" formulas." 337 "Alist of major modes with pairs of delimiters for \"plain\" formulas."
338 :group 'calc 338 :group 'calc
339 :type '(alist :key-type (symbol :tag "Major mode") 339 :type '(alist :key-type (symbol :tag "Major mode")
340 :value-type (list (string :tag "Opening \"plain\" delimiter") 340 :value-type (list (string :tag "Opening \"plain\" delimiter")
@@ -342,19 +342,19 @@ See calc-embedded-open-plain."
342 342
343(defcustom calc-embedded-open-new-formula 343(defcustom calc-embedded-open-new-formula
344 "\n\n" 344 "\n\n"
345 "*A string which is inserted at front of formula by calc-embedded-new-formula." 345 "A string which is inserted at front of formula by calc-embedded-new-formula."
346 :group 'calc 346 :group 'calc
347 :type '(string)) 347 :type '(string))
348 348
349(defcustom calc-embedded-close-new-formula 349(defcustom calc-embedded-close-new-formula
350 "\n\n" 350 "\n\n"
351 "*A string which is inserted at end of formula by calc-embedded-new-formula." 351 "A string which is inserted at end of formula by calc-embedded-new-formula."
352 :group 'calc 352 :group 'calc
353 :type '(string)) 353 :type '(string))
354 354
355(defcustom calc-embedded-open-close-new-formula-alist 355(defcustom calc-embedded-open-close-new-formula-alist
356 nil 356 nil
357 "*Alist of major modes with pairs of new formula delimiters used by calc-embedded." 357 "Alist of major modes with pairs of new formula delimiters used by calc-embedded."
358 :group 'calc 358 :group 'calc
359 :type '(alist :key-type (symbol :tag "Major mode") 359 :type '(alist :key-type (symbol :tag "Major mode")
360 :value-type (list (string :tag "Opening new formula delimiter") 360 :value-type (list (string :tag "Opening new formula delimiter")
@@ -362,14 +362,14 @@ See calc-embedded-open-plain."
362 362
363(defcustom calc-embedded-open-mode 363(defcustom calc-embedded-open-mode
364 "% " 364 "% "
365 "*A string which should precede calc-embedded mode annotations. 365 "A string which should precede calc-embedded mode annotations.
366This is not required to be present for user-written mode annotations." 366This is not required to be present for user-written mode annotations."
367 :group 'calc 367 :group 'calc
368 :type '(string)) 368 :type '(string))
369 369
370(defcustom calc-embedded-close-mode 370(defcustom calc-embedded-close-mode
371 "\n" 371 "\n"
372 "*A string which should follow calc-embedded mode annotations. 372 "A string which should follow calc-embedded mode annotations.
373This is not required to be present for user-written mode annotations." 373This is not required to be present for user-written mode annotations."
374 :group 'calc 374 :group 'calc
375 :type '(string)) 375 :type '(string))
@@ -386,7 +386,7 @@ This is not required to be present for user-written mode annotations."
386 (sgml-mode "<!-- " " -->\n") 386 (sgml-mode "<!-- " " -->\n")
387 (xml-mode "<!-- " " -->\n") 387 (xml-mode "<!-- " " -->\n")
388 (texinfo-mode "@c " "\n")) 388 (texinfo-mode "@c " "\n"))
389 "*Alist of major modes with pairs of strings to delimit annotations." 389 "Alist of major modes with pairs of strings to delimit annotations."
390 :group 'calc 390 :group 'calc
391 :type '(alist :key-type (symbol :tag "Major mode") 391 :type '(alist :key-type (symbol :tag "Major mode")
392 :value-type (list (string :tag "Opening annotation delimiter") 392 :value-type (list (string :tag "Opening annotation delimiter")
@@ -394,25 +394,25 @@ This is not required to be present for user-written mode annotations."
394 394
395(defcustom calc-gnuplot-name 395(defcustom calc-gnuplot-name
396 "gnuplot" 396 "gnuplot"
397 "*Name of GNUPLOT program, for calc-graph features." 397 "Name of GNUPLOT program, for calc-graph features."
398 :group 'calc 398 :group 'calc
399 :type '(string)) 399 :type '(string))
400 400
401(defcustom calc-gnuplot-plot-command 401(defcustom calc-gnuplot-plot-command
402 nil 402 nil
403 "*Name of command for displaying GNUPLOT output; %s = file name to print." 403 "Name of command for displaying GNUPLOT output; %s = file name to print."
404 :group 'calc 404 :group 'calc
405 :type '(choice (string) (sexp))) 405 :type '(choice (string) (sexp)))
406 406
407(defcustom calc-gnuplot-print-command 407(defcustom calc-gnuplot-print-command
408 "lp %s" 408 "lp %s"
409 "*Name of command for printing GNUPLOT output; %s = file name to print." 409 "Name of command for printing GNUPLOT output; %s = file name to print."
410 :group 'calc 410 :group 'calc
411 :type '(choice (string) (sexp))) 411 :type '(choice (string) (sexp)))
412 412
413(defcustom calc-multiplication-has-precedence 413(defcustom calc-multiplication-has-precedence
414 t 414 t
415 "*If non-nil, multiplication has precedence over division 415 "If non-nil, multiplication has precedence over division
416in normal mode." 416in normal mode."
417 :group 'calc 417 :group 'calc
418 :type 'boolean) 418 :type 'boolean)