Commit 639b2760 authored by Andreas Schwab's avatar Andreas Schwab

Merge from emacs-23

parents c1b1acc2 e454a4a3
2010-06-02 Chong Yidong <cyd@stupidchicken.com>
* searching.texi (Regexp Special): Remove obsolete information
about matching non-ASCII characters, and suggest using char
classes (Bug#6283).
2010-05-30 Juanma Barranquero <lekktu@gmail.com>
* minibuf.texi (Basic Completion): Add missing "@end defun".
......
......@@ -362,7 +362,7 @@ the two brackets are what this character alternative can match.
Thus, @samp{[ad]} matches either one @samp{a} or one @samp{d}, and
@samp{[ad]*} matches any string composed of just @samp{a}s and @samp{d}s
(including the empty string), from which it follows that @samp{c[ad]*r}
(including the empty string). It follows that @samp{c[ad]*r}
matches @samp{cr}, @samp{car}, @samp{cdr}, @samp{caddaar}, etc.
You can also include character ranges in a character alternative, by
......@@ -400,20 +400,11 @@ is @samp{@var{c}..?\377}, the other is @samp{@var{c1}..@var{c2}}, where
@var{c1} is the first character of the charset to which @var{c2}
belongs.
You cannot always match all non-@acronym{ASCII} characters with the regular
expression @code{"[\200-\377]"}. This works when searching a unibyte
buffer or string (@pxref{Text Representations}), but not in a multibyte
buffer or string, because many non-@acronym{ASCII} characters have codes
above octal 0377. However, the regular expression @code{"[^\000-\177]"}
does match all non-@acronym{ASCII} characters (see below regarding @samp{^}),
in both multibyte and unibyte representations, because only the
@acronym{ASCII} characters are excluded.
A character alternative can also specify named
character classes (@pxref{Char Classes}). This is a POSIX feature whose
syntax is @samp{[:@var{class}:]}. Using a character class is equivalent
to mentioning each of the characters in that class; but the latter is
not feasible in practice, since some classes include thousands of
A character alternative can also specify named character classes
(@pxref{Char Classes}). This is a POSIX feature whose syntax is
@samp{[:@var{class}:]}. Using a character class is equivalent to
mentioning each of the characters in that class; but the latter is not
feasible in practice, since some classes include thousands of
different characters.
@item @samp{[^ @dots{} ]}
......@@ -431,6 +422,10 @@ A complemented character alternative can match a newline, unless newline is
mentioned as one of the characters not to match. This is in contrast to
the handling of regexps in programs such as @code{grep}.
You can specify named character classes, just like in character
alternatives. For instance, @samp{[^[:ascii:]]} matches any
non-@acronym{ASCII} character. @xref{Char Classes}.
@item @samp{^}
@cindex beginning of line in regexp
When matching a buffer, @samp{^} matches the empty string, but only at the
......
2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/advice.el (ad-compile-function):
Define warning-suppress-types before we let-bind it (bug#6275).
* vc-dispatcher.el: Rename mode-line-hook to vc-mode-line-hook;
declare it, make it buffer-local and permanent-local (bug#6324).
(vc-resynch-window): Adjust name.
* vc-hooks.el (vc-find-file-hook): Adjust name.
2010-06-09 Michael Albinus <michael.albinus@gmx.de>
* net/notifications.el (notifications-notify): Fix docstring.
......@@ -66,6 +76,13 @@
* emacs-lisp/smie.el (smie-indent-keyword): Remove special case that
can be handled with a ((:before "fn") (:prev "=>" parent)) rule.
2010-06-07 Jonathan Rockway <jon@jrock.us>
* net/rcirc.el: Add support for password authentication.
(rcirc-server-alist): Add :password keyword.
(rcirc): Ask for a password, or get it from the server's alist.
(rcirc-connect): Add password argument. Pass it to server.
2010-06-07 Martin Pohlack <mp26@os.inf.tu-dresden.de>
* iimage.el: Remove images as soon as the underlying text is modified.
......@@ -103,6 +120,14 @@
by checking for empty match. This syncs this loop with the
similar loop in `isearch-search'. (Bug#6362)
2010-06-05 Juanma Barranquero <lekktu@gmail.com>
* net/dbus.el (dbus-register-method): Declare function.
(dbus-handle-event, dbus-property-handler): Fix typos in docstrings.
(dbus-introspect): Doc fix.
(dbus-event-bus-name, dbus-introspect-get-interface)
(dbus-introspect-get-argument): Reflow docstrings.
2010-06-05 Dan Nicolaescu <dann@ics.uci.edu>
vc-log-incoming/vc-log-outgoing fixes for Git.
......@@ -112,6 +137,11 @@
instead of vc-git-compute-remote.
(vc-git-compute-remote): Remove.
2010-06-04 Chong Yidong <cyd@stupidchicken.com>
* term/common-win.el (x-colors): Add "dark green" and "dark
turquoise" (Bug#6332).
2010-06-04 Juri Linkov <juri@jurta.org>
* simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
......@@ -143,6 +173,17 @@
* international/mule.el (make-translation-table-from-vector): Doc fix.
2010-06-03 Eric Ludlam <zappo@gnu.org>
* cedet/semantic/lex-spp.el
(semantic-lex-spp-table-write-slot-value): Instead of erroring on
invalid values during save, just save a nil (Bug#6324).
2010-06-03 Glenn Morris <rgm@gnu.org>
* desktop.el (desktop-clear-preserve-buffers):
Add "*Warnings*" buffer. (Bug#6336)
2010-06-03 Dan Nicolaescu <dann@ics.uci.edu>
vc-log-incoming/vc-log-outgoing improvements for Git.
......
......@@ -1121,37 +1121,31 @@ The VALUE is a spp lexical table."
(prin1 (car sym))
(let* ((first (car (cdr sym)))
(rest (cdr sym)))
(when (not (listp first))
(error "Error in macro \"%s\"" (car sym)))
(when (eq (car first) 'spp-arg-list)
(princ " ")
(prin1 first)
(setq rest (cdr rest))
)
(when rest
(princ " . ")
(let ((len (length (cdr rest))))
(cond ((< len 2)
(condition-case nil
(prin1 rest)
(error
(princ "nil ;; Error writing macro\n"))))
((< len semantic-lex-spp-macro-max-length-to-save)
(princ "\n ")
(condition-case nil
(prin1 rest)
(error
(princ "nil ;; Error writing macro\n ")))
)
(t ;; Too Long!
(princ "nil ;; Too Long!\n ")
))))
)
(princ ")\n ")
)
(princ ")\n"))
)
(if (not (listp first))
(insert "nil ;; bogus macro found.\n")
(when (eq (car first) 'spp-arg-list)
(princ " ")
(prin1 first)
(setq rest (cdr rest)))
(when rest
(princ " . ")
(let ((len (length (cdr rest))))
(cond ((< len 2)
(condition-case nil
(prin1 rest)
(error
(princ "nil ;; Error writing macro\n"))))
((< len semantic-lex-spp-macro-max-length-to-save)
(princ "\n ")
(condition-case nil
(prin1 rest)
(error
(princ "nil ;; Error writing macro\n "))))
(t ;; Too Long!
(princ "nil ;; Too Long!\n ")))))))
(princ ")\n "))
(princ ")\n")))
;;; MACRO TABLE DEBUG
;;
......
......@@ -426,7 +426,7 @@ as well as widgets, buttons, overlays, and text properties."
;; When the composition is trivial (i.e. composed only with the
;; current character itself without any alternate characters),
;; we don't show the composition information. Otherwise, store
;; two descriptive strings in the first two elments of
;; two descriptive strings in the first two elements of
;; COMPOSITION.
(or (catch 'tag
(let ((from (car composition))
......
......@@ -303,10 +303,12 @@ to the value obtained by evaluating FORM."
:version "22.1")
(defcustom desktop-clear-preserve-buffers
'("\\*scratch\\*" "\\*Messages\\*" "\\*server\\*" "\\*tramp/.+\\*")
'("\\*scratch\\*" "\\*Messages\\*" "\\*server\\*" "\\*tramp/.+\\*"
"\\*Warnings\\*")
"List of buffers that `desktop-clear' should not delete.
Each element is a regular expression. Buffers with a name matched by any of
these won't be deleted."
:version "23.3" ; added Warnings - bug#6336
:type '(repeat string)
:group 'desktop)
......
......@@ -2684,6 +2684,8 @@ For that it has to be fbound with a non-autoload definition."
;; because `byte-compile' uses `fset':
(ad-with-auto-activation-disabled
(require 'bytecomp)
(require 'warnings) ;To define warning-suppress-types
;before we let-bind it.
(let ((symbol (make-symbol "advice-compilation"))
(byte-compile-warnings byte-compile-warnings)
;; Don't pop up windows showing byte-compiler warnings.
......
......@@ -231,7 +231,7 @@
(move-to-column mc)
(set-mark (point))
(goto-char pp)
;; Move cursor inside rectangle, except if char at rigth edge is a tab.
;; Move cursor inside rectangle, except if char at right edge is a tab.
(if (and (if (cua--rectangle-right-side)
(and (= (move-to-column pc) (- pc tab-width))
(not (eolp)))
......
;;; mule-util.el --- utility functions for mulitilingual environment (mule)
;;; mule-util.el --- utility functions for multilingual environment (mule)
;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
......
......@@ -414,7 +414,7 @@ message%s"
;; to make sure message-subject is actually evaluated and its value
;; substituted.
(add-to-list 'rsf-definitions-alist
;; Note that an empty elment is treated the same as
;; Note that an empty element is treated the same as
;; an absent one, so why does it bother to add them?
(list '(from . "")
'(to . "")
......
......@@ -38,6 +38,7 @@
(declare-function dbus-method-return-internal "dbusbind.c")
(declare-function dbus-method-error-internal "dbusbind.c")
(declare-function dbus-register-signal "dbusbind.c")
(declare-function dbus-register-method "dbusbind.c")
(defvar dbus-debug)
(defvar dbus-registered-objects-table)
......@@ -398,7 +399,7 @@ not well formed."
"Handle events from the D-Bus.
EVENT is a D-Bus event, see `dbus-check-event'. HANDLER, being
part of the event, is called with arguments ARGS.
If the HANDLER returns an `dbus-error', it is propagated as return message."
If the HANDLER returns a `dbus-error', it is propagated as return message."
(interactive "e")
(condition-case err
(let (result)
......@@ -434,8 +435,7 @@ If the HANDLER returns an `dbus-error', it is propagated as return message."
"Return the bus name the event is coming from.
The result is either the symbol `:system' or the symbol `:session'.
EVENT is a D-Bus event, see `dbus-check-event'. This function
raises a `dbus-error' signal in case the event is not well
formed."
raises a `dbus-error' signal in case the event is not well formed."
(dbus-check-event event)
(nth 1 event))
......@@ -562,7 +562,7 @@ apply
;;; D-Bus introspection.
(defun dbus-introspect (bus service path)
"This function returns all interfaces and sub-nodes of SERVICE,
"Return all interfaces and sub-nodes of SERVICE,
registered at object path PATH at bus BUS.
BUS must be either the symbol `:system' or the symbol `:session'.
......@@ -634,9 +634,8 @@ children, beside \"method\" and \"signal\" objects."
(defun dbus-introspect-get-interface (bus service path interface)
"Return the INTERFACE of SERVICE in D-Bus BUS at object path PATH.
The return value is an XML object. INTERFACE must be a string,
element of the list returned by
`dbus-introspect-get-interface-names'. The resulting
\"interface\" object can contain \"method\", \"signal\",
element of the list returned by `dbus-introspect-get-interface-names'.
The resulting \"interface\" object can contain \"method\", \"signal\",
\"property\" and \"annotation\" children."
(let ((elt (xml-get-children
(dbus-introspect-xml bus service path) 'interface)))
......@@ -776,8 +775,8 @@ therefore, even if the method or signal has arguments."
(defun dbus-introspect-get-argument (bus service path interface name arg)
"Return argument ARG as XML object.
NAME must be a \"method\" or \"signal\" object. ARG must be a
string, element of the list returned by `dbus-introspect-get-argument-names'."
NAME must be a \"method\" or \"signal\" object. ARG must be a string,
element of the list returned by `dbus-introspect-get-argument-names'."
(let ((elt (xml-get-children
(or (dbus-introspect-get-method bus service path interface name)
(dbus-introspect-get-signal bus service path interface name))
......@@ -922,7 +921,7 @@ PATH, including a default handler for the \"Get\", \"GetAll\" and
(list key (list service path))))
(defun dbus-property-handler (&rest args)
"Default Handler for the \"org.freedesktop.DBus.Properties\" interface.
"Default handler for the \"org.freedesktop.DBus.Properties\" interface.
It will be registered for all objects created by `dbus-register-object'."
(let ((bus (dbus-event-bus-name last-input-event))
(path (dbus-event-path-name last-input-event))
......
......@@ -81,6 +81,11 @@ VALUE must be a number or string. If absent,
VALUE must be a string. If absent, `rcirc-default-user-name' is
used.
`:password'
VALUE must be a string. If absent, no PASS command will be sent
to the server.
`:full-name'
VALUE must be a string. If absent, `rcirc-default-full-name' is
......@@ -99,6 +104,7 @@ connected to automatically."
:value-type (plist :options ((:nick string)
(:port integer)
(:user-name string)
(:password string)
(:full-name string)
(:pass string)
(:channels (repeat string)))))
......@@ -429,7 +435,8 @@ If ARG is non-nil, instead prompt for connection parameters."
(pass (plist-get (cdr c) :pass))
(full-name (or (plist-get (cdr c) :full-name)
rcirc-default-full-name))
(channels (plist-get (cdr c) :channels)))
(channels (plist-get (cdr c) :channels))
(password (plist-get (cdr c) :password)))
(when server
(let (connected)
(dolist (p (rcirc-process-list))
......@@ -438,7 +445,7 @@ If ARG is non-nil, instead prompt for connection parameters."
(if (not connected)
(condition-case e
(rcirc-connect server port nick user-name pass
full-name channels)
full-name channels password)
(quit (message "Quit connecting to %s" server)))
(with-current-buffer (process-buffer connected)
(setq connected-servers
......
......@@ -275,10 +275,11 @@ This function returns ARGS minus the arguments that have been processed."
"medium slate blue" "slate blue" "dark slate blue" "midnight blue" "navy"
"dark blue" "light steel blue" "cornflower blue" "dodger blue" "royal blue"
"light slate gray" "slate gray" "dark slate gray" "steel blue" "cadet blue"
"light sky blue" "sky blue" "light blue" "powder blue" "pale turquoise" "turquoise"
"medium turquoise" "dark cyan" "aquamarine" "medium aquamarine" "light sea green"
"light sky blue" "sky blue" "light blue" "powder blue" "pale turquoise"
"turquoise" "medium turquoise" "dark turquoise" "dark cyan" "aquamarine"
"medium aquamarine" "light sea green"
"medium sea green" "sea green" "dark sea green" "pale green" "lime green"
"forest green" "light green" "green yellow" "yellow green" "olive drab"
"dark green" "forest green" "light green" "green yellow" "yellow green" "olive drab"
"dark olive green" "lemon chiffon" "khaki" "dark khaki" "cornsilk"
"pale goldenrod" "light goldenrod" "goldenrod" "dark goldenrod" "wheat"
"navajo white" "tan" "burlywood" "sandy brown" "peru" "chocolate" "saddle brown"
......@@ -287,7 +288,7 @@ This function returns ARGS minus the arguments that have been processed."
"dark magenta" "dark violet" "medium blue" "blue" "deep sky blue"
"cyan" "medium spring green" "spring green" "green" "lawn green" "chartreuse"
"yellow" "gold" "orange" "dark orange" "orange red" "red" "white" "white smoke"
"gainsboro" "light grey" "gray" "dark grey" "dim gray" "black" ))
"gainsboro" "light gray" "gray" "dark gray" "dim gray" "black" ))
"List of basic colors available on color displays.
For X, the list comes from the `rgb.txt' file,v 10.41 94/02/20.
For Nextstep, this is a list of non-PANTONE colors returned by
......
......@@ -101,7 +101,7 @@
;; that on-disk files and the contents of their visiting Emacs buffers
;; coincide.
;;
;; When the client mode adds a local mode-line-hook to a buffer, it
;; When the client mode adds a local vc-mode-line-hook to a buffer, it
;; will be called with the buffer file name as argument whenever the
;; dispatcher resynchs the buffer.
......@@ -446,6 +446,10 @@ ARG and NO-CONFIRM are passed on to `revert-buffer'."
(revert-buffer arg no-confirm t))
(vc-restore-buffer-context context)))
(defvar vc-mode-line-hook nil)
(make-variable-buffer-local 'vc-mode-line-hook)
(put 'vc-mode-line-hook 'permanent-local t)
(defun vc-resynch-window (file &optional keep noquery reset-vc-info)
"If FILE is in the current buffer, either revert or unvisit it.
The choice between revert (to see expanded keywords) and unvisit
......@@ -473,7 +477,8 @@ editing!"
(not (eq (get major-mode 'mode-class) 'special))
(view-mode-enter))))
(run-hook-with-args 'mode-line-hook buffer-file-name))
;; FIXME: Why use a hook? Why pass it buffer-file-name?
(run-hook-with-args 'vc-mode-line-hook buffer-file-name))
(kill-buffer (current-buffer)))))
(declare-function vc-dir-resynch-file "vc-dir" (&optional fname))
......
......@@ -876,7 +876,8 @@ current, and kill the buffer that visits the link."
(setq vc-mode nil))
(when buffer-file-name
(vc-file-clearprops buffer-file-name)
(add-hook 'mode-line-hook 'vc-mode-line nil t)
;; FIXME: Why use a hook? Why pass it buffer-file-name?
(add-hook 'vc-mode-line-hook 'vc-mode-line nil t)
(let (backend)
(cond
((setq backend (with-demoted-errors (vc-backend buffer-file-name)))
......
2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca>
* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Check `object's type before accessing its guts.
2010-06-09 Dan Nicolaescu <dann@ics.uci.edu>
* s/usg5-4.h: Fix previous change.
Suggested by Lawrence Mitchell <wence@gmx.li>
2010-06-08 Andreas Schwab <schwab@linux-m68k.org>
* minibuf.c (Fall_completions): Add more checks.
2010-06-08 Juanma Barranquero <lekktu@gmail.com>
* minibuf.c (Fall_completions): Check COLLECTION's size (bug#6378).
2010-06-08 Dan Nicolaescu <dann@ics.uci.edu>
* lread.c (X_OK): Remove, unused.
......@@ -74,6 +87,15 @@
* w32proc.c (CORRECT_DIR_SEPS): Remove.
(Fw32_short_file_name, Fw32_long_file_name): Use dostounix_filename.
2010-06-03 Andreas Schwab <schwab@linux-m68k.org>
* process.c (conv_lisp_to_sockaddr): Fix conversion of IPv4
address. (Bug#6346)
2010-06-03 Juanma Barranquero <lekktu@gmail.com>
* ccl.c (Fccl_program_p): Fix typo in docstring.
2010-06-03 Dan Nicolaescu <dann@ics.uci.edu>
Move UNEXEC definition to autoconf.
......
......@@ -1362,7 +1362,7 @@ ccl_driver (ccl, source, destination, src_size, dst_size, charset_list)
if (point >= size) continue;
map = AREF (Vcode_conversion_map_vector, point);
/* Check map varidity. */
/* Check map validity. */
if (!CONSP (map)) continue;
map = XCDR (map);
if (!VECTORP (map)) continue;
......@@ -1373,7 +1373,7 @@ ccl_driver (ccl, source, destination, src_size, dst_size, charset_list)
/* check map type,
[STARTPOINT VAL1 VAL2 ...] or
[t ELELMENT STARTPOINT ENDPOINT] */
[t ELEMENT STARTPOINT ENDPOINT] */
if (NUMBERP (content))
{
point = XUINT (content);
......@@ -1535,7 +1535,7 @@ ccl_driver (ccl, source, destination, src_size, dst_size, charset_list)
if (point >= map_vector_size) continue;
map = AREF (Vcode_conversion_map_vector, point);
/* Check map varidity. */
/* Check map validity. */
if (!CONSP (map)) continue;
map = XCDR (map);
if (!VECTORP (map)) continue;
......@@ -1977,7 +1977,7 @@ check_ccl_update (ccl)
DEFUN ("ccl-program-p", Fccl_program_p, Sccl_program_p, 1, 1, 0,
doc: /* Return t if OBJECT is a CCL program name or a compiled CCL program code.
See the documentation of `define-ccl-program' for the detail of CCL program. */)
See the documentation of `define-ccl-program' for the detail of CCL program. */)
(object)
Lisp_Object object;
{
......@@ -2229,7 +2229,7 @@ Return index number of the registered CCL program. */)
slot = AREF (Vccl_program_table, idx);
if (!VECTORP (slot))
/* This is the first unsed slot. Register NAME here. */
/* This is the first unused slot. Register NAME here. */
break;
if (EQ (name, AREF (slot, 0)))
......
......@@ -264,7 +264,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* If P is before LIMIT, advance P to the next character boundary.
Assumes that P is already at a character boundary of the same
mulitbyte form whose end address is LIMIT. */
multibyte form whose end address is LIMIT. */
#define NEXT_CHAR_BOUNDARY(p, limit) \
do { \
......
......@@ -405,6 +405,7 @@ xd_append_arg (dtype, object, iter)
switch (dtype)
{
case DBUS_TYPE_BYTE:
CHECK_NUMBER (object);
{
unsigned char val = XUINT (object) & 0xFF;
XD_DEBUG_MESSAGE ("%c %d", dtype, val);
......@@ -423,6 +424,7 @@ xd_append_arg (dtype, object, iter)
}
case DBUS_TYPE_INT16:
CHECK_NUMBER (object);
{
dbus_int16_t val = XINT (object);
XD_DEBUG_MESSAGE ("%c %d", dtype, (int) val);
......@@ -432,6 +434,7 @@ xd_append_arg (dtype, object, iter)
}
case DBUS_TYPE_UINT16:
CHECK_NUMBER (object);
{
dbus_uint16_t val = XUINT (object);
XD_DEBUG_MESSAGE ("%c %u", dtype, (unsigned int) val);
......@@ -441,6 +444,7 @@ xd_append_arg (dtype, object, iter)
}
case DBUS_TYPE_INT32:
CHECK_NUMBER (object);
{
dbus_int32_t val = XINT (object);
XD_DEBUG_MESSAGE ("%c %d", dtype, val);
......@@ -450,6 +454,7 @@ xd_append_arg (dtype, object, iter)
}
case DBUS_TYPE_UINT32:
CHECK_NUMBER (object);
{
dbus_uint32_t val = XUINT (object);
XD_DEBUG_MESSAGE ("%c %u", dtype, val);
......@@ -459,6 +464,7 @@ xd_append_arg (dtype, object, iter)
}
case DBUS_TYPE_INT64:
CHECK_NUMBER (object);
{
dbus_int64_t val = XINT (object);
XD_DEBUG_MESSAGE ("%c %d", dtype, (int) val);
......@@ -468,6 +474,7 @@ xd_append_arg (dtype, object, iter)
}
case DBUS_TYPE_UINT64:
CHECK_NUMBER (object);
{
dbus_uint64_t val = XUINT (object);
XD_DEBUG_MESSAGE ("%c %u", dtype, (unsigned int) val);
......@@ -477,6 +484,7 @@ xd_append_arg (dtype, object, iter)
}
case DBUS_TYPE_DOUBLE:
CHECK_FLOAT (object);
{
double val = XFLOAT_DATA (object);
XD_DEBUG_MESSAGE ("%c %f", dtype, val);
......@@ -488,8 +496,13 @@ xd_append_arg (dtype, object, iter)
case DBUS_TYPE_STRING:
case DBUS_TYPE_OBJECT_PATH:
case DBUS_TYPE_SIGNATURE:
CHECK_STRING (object);
{
char *val = SDATA (Fstring_make_unibyte (object));
/* We need to send a valid UTF-8 string. We could encode `object'
but by not encoding it, we guarantee it's valid utf-8, even if
it contains eight-bit-bytes. Of course, you can still send
manually-crafted junk by passing a unibyte string. */
char *val = SDATA (object);
XD_DEBUG_MESSAGE ("%c %s", dtype, val);
if (!dbus_message_iter_append_basic (iter, dtype, &val))
XD_SIGNAL2 (build_string ("Unable to append argument"), object);
......
/* Random utility Lisp functions.
Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997,
1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
2005, 2006, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
This file is part of GNU Emacs.
......@@ -514,7 +515,7 @@ concat (nargs, args, target_type, last_special)
So, we record strings that have text properties to be copied
here, and copy the text properties after the concatination. */
struct textprop_rec *textprops = NULL;
/* Number of elments in textprops. */
/* Number of elements in textprops. */
int num_textprops = 0;
USE_SAFE_ALLOCA;
......
......@@ -730,7 +730,7 @@ get_logical_fringe_bitmap (w, bitmap, right_p, partial_p)
Elements are:
BITMAP -- use for all
(L R) -- use for left right (whether partial or not)
(L R PL PR) -- use for left rigth partial-left partial-right
(L R PL PR) -- use for left right partial-left partial-right
If any value in local binding is not present or t, use global value.
If partial, lookup partial bitmap in default value if not found here.
......
......@@ -932,7 +932,7 @@ struct Lisp_Sub_Char_Table
struct Lisp_Vector *next;
/* Depth of this sub char-table. It should be 1, 2, or 3. A sub
char-table of depth 1 contains 16 elments, and each element
char-table of depth 1 contains 16 elements, and each element
covers 4096 (128*32) characters. A sub char-table of depth 2
contains 32 elements, and each element covers 128 characters. A
sub char-table of depth 3 contains 128 elements, and each element
......@@ -1139,7 +1139,7 @@ struct Lisp_Hash_Table
Lisp_Object user_cmp_function;
/* Only the fields above are traced normally by the GC. The ones below
`count'. are special and are either ignored by the GC or traced in
`count' are special and are either ignored by the GC or traced in
a special way (e.g. because of weakness). */
/* Number of key/value entries in the table. */
......@@ -1326,9 +1326,9 @@ struct Lisp_Buffer_Objfwd
binding into `realvalue' (or through it). Also update