Merged from miles@gnu.org--gnu-2005 (patch 441-446)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-441
   Update reference to renamed Buffer-menu-buffer face

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-442
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-443
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-444
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-445
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-446
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-354

18 files changed, 130 insertions, 69 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 659f1066efc..2ffb3c4959c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,45 @@
+2005-06-23  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (get_next_display_element): Finish reversing the tests of
+        Vnobreak_char_display.
+
+        * xdisp.c (Vnobreak_char_display): Renamed from Vshow_nonbreak_escape.
+        All uses changed.
+        (Qnobreak_space): Renamed from Qno_break_space.  All uses changed.
+        (syms_of_xdisp): Define nobreak-char-display and nobreak-space.
+
+        * fileio.c (Frename_file): Preserve owner and group, if possible,
+        when copying.
+
+2005-06-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * abbrev.c (Funexpand_abbrev):
+        * category.c (Fmake_category_set):
+        * dispnew.c (Fsleep_for, Fsit_for):
+        * editfns.c (Fsubst_char_in_region):
+        * eval.c (Fdefvar, Fdefconst, Feval, Ffuncall):
+        * frame.c (make_frame_without_minibuffer):
+        * lread.c (read_vector):
+        * macfns.c (check_x_frame):
+        * process.c (Fstop_process, Fcontinue_process):
+        * search.c (Freplace_match):
+        * syntax.c (Fstring_to_syntax):
+        * w32fns.c (check_x_frame, check_x_display_info):
+        * xfaces.c (x_supports_face_attributes_p):
+        * xselect.c (Fx_own_selection_internal): Follow error conventions.
+
+        * image.c (fn_png_init_io): Don't define it.
+        (init_png_functions) [HAVE_NTGUI]: Don't initialize fn_png_init_io.
+        (png_read_from_file): New function, based on png_read_from_memory.
+        (png_load): Use it, instead of fn_png_init_io.
+
+2005-06-23  Kim F. Storm  <storm@cua.dk>
+
+        * search.c (Fmatch_data): Remove evaporate option.
+        (Fset_match_data): Do not mention evaporate option in doc string.
+        Add commentary explaining evaporate arg (for internal use only).
+        (unwind_set_match_data): Add comment on evaporate use.
+
 2005-06-22  Miles Bader  <miles@gnu.org>
 
         * xfaces.c (Qvertical_border): Renamed from `Qvertical_divider'.
@@ -2799,7 +2841,7 @@
 
         * xdisp.c (expose_window, expose_frame): Remove kludges for Mac.
 
-        * xfaces.c (clear_font_table) [MAC_OS]: call mac_unload_font.
+        * xfaces.c (clear_font_table) [MAC_OS]: Call mac_unload_font.
 
 2004-12-27  Richard M. Stallman  <rms@gnu.org>
 
@@ -2838,7 +2880,7 @@
         (xmenu_show): In no toolkit version, if menu returns NO_SELECT call
         Fsignal to quit.
 
-        * xfns.c (Fx_file_dialog): Motif/Lesstif version:  Pop down on C-g.
+        * xfns.c (Fx_file_dialog): Motif/Lesstif version: Pop down on C-g.
 
         * gtkutil.c (xg_initialize): Install bindings for C-g so that
         dialogs and menus pop down.
@@ -3624,7 +3666,7 @@
 2004-11-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * xmenu.c (x_menu_wait_for_event): New function.
-        (popup_get_selection, popup_widget_loop):  Call x_menu_wait_for_event
+        (popup_get_selection, popup_widget_loop): Call x_menu_wait_for_event
         to handle timers.
         (popup_widget_loop): Add argument do_timers.
         (create_and_show_popup_menu, create_and_show_dialog): Pass 1 for
@@ -4002,7 +4044,7 @@
 
 2004-10-28  Will  <will@glozer.net>
 
-        * macterm.c: allow user to assign key modifiers to the Mac Option
+        * macterm.c: Allow user to assign key modifiers to the Mac Option
         key via a 'mac-option-modifier' variable.
 
 2004-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -4864,7 +4906,7 @@
 
         * keymap.c (Fset_keymap_parent, Fdefine_prefix_command): Doc fixes.
 
-        * keyboard.c (syms_of_keyboard) <disable-point-adjustment>:  Doc fix.
+        * keyboard.c (syms_of_keyboard) <disable-point-adjustment>: Doc fix.
 
         * callint.c (Fcall_interactively): Doc fix.
 
@@ -8191,7 +8233,7 @@
         * fileio.c (Fread_file_name): Check use_file_dialog also before
         calling Fx_file_dialog.
 
-        * fns.c: use_file_dialog: New variable.
+        * fns.c (use_file_dialog): New variable.
         (syms_of_fns): DEFVAR_BOOL use-file-dialog.
 
 2003-11-29  Kim F. Storm  <storm@cua.dk>
@@ -11637,7 +11679,7 @@
         for USE_GTK.
         (x_scroll_bar_handle_click): Use this function for toolkit scrollbars
         also.
-        (handle_one_xevent): ButtonPress/Release:  If event is for a toolkit
+        (handle_one_xevent): ButtonPress/Release: If event is for a toolkit
         scrollbar and control is pressed, call x_scroll_bar_handle_click.
 
         * gtkutil.h (xg_get_scroll_id_for_window): Declare.
diff --git a/src/abbrev.c b/src/abbrev.c
index ac132f20023..3883e35da31 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -442,7 +442,7 @@ is not undone.  */)
 
       val = SYMBOL_VALUE (Vlast_abbrev);
       if (!STRINGP (val))
-        error ("value of abbrev-symbol must be a string");
+        error ("Value of `abbrev-symbol' must be a string");
       zv_before = ZV;
       del_range_byte (PT_BYTE, PT_BYTE + SBYTES (val), 1);
       /* Don't inherit properties here; just copy from old contents.  */
diff --git a/src/category.c b/src/category.c
index b7eadd0e771..1cae5a6e756 100644
--- a/src/category.c
+++ b/src/category.c
@@ -67,7 +67,7 @@ those categories.  */)
   val = MAKE_CATEGORY_SET;
 
   if (STRING_MULTIBYTE (categories))
-    error ("Multibyte string in make-category-set");
+    error ("Multibyte string in `make-category-set'");
 
   len = SCHARS (categories);
   while (--len >= 0)
diff --git a/src/dispnew.c b/src/dispnew.c
index c5256142588..cc9e6152d1a 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6374,7 +6374,7 @@ Emacs was built without floating point support.
 
 #ifndef EMACS_HAS_USECS
   if (sec == 0 && usec != 0)
-    error ("millisecond `sleep-for' not supported on %s", SYSTEM_TYPE);
+    error ("Millisecond `sleep-for' not supported on %s", SYSTEM_TYPE);
 #endif
 
   /* Assure that 0 <= usec < 1000000.  */
@@ -6474,7 +6474,7 @@ usage: (sit-for SECONDS &optional NODISP OLD-NODISP) */)
 
 #ifndef EMACS_HAS_USECS
   if (usec != 0 && sec == 0)
-    error ("millisecond `sit-for' not supported on %s", SYSTEM_TYPE);
+    error ("Millisecond `sit-for' not supported on %s", SYSTEM_TYPE);
 #endif
 
   return sit_for (sec, usec, 0, NILP (nodisp), NILP (nodisp));
diff --git a/src/editfns.c b/src/editfns.c
index 4bc5336e997..a7296c4428f 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2660,7 +2660,7 @@ Both characters must have the same length of multi-byte form.  */)
     {
       len = CHAR_STRING (XFASTINT (fromchar), fromstr);
       if (CHAR_STRING (XFASTINT (tochar), tostr) != len)
-        error ("Characters in subst-char-in-region have different byte-lengths");
+        error ("Characters in `subst-char-in-region' have different byte-lengths");
       if (!ASCII_BYTE_P (*tostr))
         {
           /* If *TOSTR is in the range 0x80..0x9F and TOCHAR is not a
diff --git a/src/eval.c b/src/eval.c
index 445eb283114..8ad289fd51f 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -785,7 +785,7 @@ usage: (defvar SYMBOL &optional INITVALUE DOCSTRING)  */)
   sym = Fcar (args);
   tail = Fcdr (args);
   if (!NILP (Fcdr (Fcdr (tail))))
-    error ("too many arguments");
+    error ("Too many arguments");
 
   tem = Fdefault_boundp (sym);
   if (!NILP (tail))
@@ -845,7 +845,7 @@ usage: (defconst SYMBOL INITVALUE [DOCSTRING])  */)
 
   sym = Fcar (args);
   if (!NILP (Fcdr (Fcdr (Fcdr (args)))))
-    error ("too many arguments");
+    error ("Too many arguments");
 
   tem = Feval (Fcar (Fcdr (args)));
   if (!NILP (Vpurify_flag))
@@ -2037,7 +2037,7 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
       if (max_lisp_eval_depth < 100)
         max_lisp_eval_depth = 100;
       if (lisp_eval_depth > max_lisp_eval_depth)
-        error ("Lisp nesting exceeds max-lisp-eval-depth");
+        error ("Lisp nesting exceeds `max-lisp-eval-depth'");
     }
 
   original_fun = Fcar (form);
@@ -2733,7 +2733,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
       if (max_lisp_eval_depth < 100)
         max_lisp_eval_depth = 100;
       if (lisp_eval_depth > max_lisp_eval_depth)
-        error ("Lisp nesting exceeds max-lisp-eval-depth");
+        error ("Lisp nesting exceeds `max-lisp-eval-depth'");
     }
 
   backtrace.next = backtrace_list;
diff --git a/src/fileio.c b/src/fileio.c
index c38cb924c8b..075f12ccb21 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2777,6 +2777,7 @@ This is what happens in interactive use with M-x.  */)
     {
       if (errno == EXDEV)
         {
+          struct stat data;
 #ifdef S_IFLNK
           symlink_target = Ffile_symlink_p (file);
           if (! NILP (symlink_target))
@@ -2789,6 +2790,11 @@ This is what happens in interactive use with M-x.  */)
                            so don't have copy-file prompt again.  */
                         NILP (ok_if_already_exists) ? Qnil : Qt,
                         Qt, Qnil);
+
+          /* Preserve owner and group, if possible (if we are root).  */
+          if (stat (SDATA (encoded_file), &data) >= 0)
+            chown (SDATA (encoded_file), data.st_uid, data.st_gid);
+
           Fdelete_file (file);
         }
       else
diff --git a/src/frame.c b/src/frame.c
index 62dba4d4d15..6a54e26121f 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -426,7 +426,7 @@ make_frame_without_minibuffer (mini_window, kb, display)
 #ifdef MULTI_KBOARD
   if (!NILP (mini_window)
       && XFRAME (XWINDOW (mini_window)->frame)->kboard != kb)
-    error ("frame and minibuffer must be on the same display");
+    error ("Frame and minibuffer must be on the same display");
 #endif
 
   /* Make a frame containing just a root window.  */
@@ -3609,7 +3609,7 @@ extern char *x_get_string_resource P_ ((XrmDatabase, char *, char *));
 extern Display_Info *check_x_display_info P_ ((Lisp_Object));
 
 
-/* Get specified attribute from resource database RDB.  
+/* Get specified attribute from resource database RDB.
    See Fx_get_resource below for other parameters.  */
 
 static Lisp_Object
@@ -3746,7 +3746,7 @@ x_get_resource_string (attribute, class)
 
 Lisp_Object
 x_get_arg (dpyinfo, alist, param, attribute, class, type)
-     Display_Info *dpyinfo; 
+     Display_Info *dpyinfo;
      Lisp_Object alist, param;
      char *attribute;
      char *class;
diff --git a/src/image.c b/src/image.c
index 462294b33b4..b2d0cf4ff50 100644
--- a/src/image.c
+++ b/src/image.c
@@ -5631,7 +5631,6 @@ DEF_IMGLIB_FN (png_create_read_struct);
 DEF_IMGLIB_FN (png_create_info_struct);
 DEF_IMGLIB_FN (png_destroy_read_struct);
 DEF_IMGLIB_FN (png_set_read_fn);
-DEF_IMGLIB_FN (png_init_io);
 DEF_IMGLIB_FN (png_set_sig_bytes);
 DEF_IMGLIB_FN (png_read_info);
 DEF_IMGLIB_FN (png_get_IHDR);
@@ -5663,7 +5662,6 @@ init_png_functions (Lisp_Object libraries)
   LOAD_IMGLIB_FN (library, png_create_info_struct);
   LOAD_IMGLIB_FN (library, png_destroy_read_struct);
   LOAD_IMGLIB_FN (library, png_set_read_fn);
-  LOAD_IMGLIB_FN (library, png_init_io);
   LOAD_IMGLIB_FN (library, png_set_sig_bytes);
   LOAD_IMGLIB_FN (library, png_read_info);
   LOAD_IMGLIB_FN (library, png_get_IHDR);
@@ -5689,7 +5687,6 @@ init_png_functions (Lisp_Object libraries)
 #define fn_png_create_info_struct       png_create_info_struct
 #define fn_png_destroy_read_struct      png_destroy_read_struct
 #define fn_png_set_read_fn              png_set_read_fn
-#define fn_png_init_io                  png_init_io
 #define fn_png_set_sig_bytes            png_set_sig_bytes
 #define fn_png_read_info                png_read_info
 #define fn_png_get_IHDR                 png_get_IHDR
@@ -5762,6 +5759,23 @@ png_read_from_memory (png_ptr, data, length)
 }
 
 
+/* Function set as reader function when reading PNG image from a file.
+   PNG_PTR is a pointer to the PNG control structure.  Copy LENGTH
+   bytes from the input to DATA.  */
+
+static void
+png_read_from_file (png_ptr, data, length)
+     png_structp png_ptr;
+     png_bytep data;
+     png_size_t length;
+{
+  FILE *fp = (FILE *) fn_png_get_io_ptr (png_ptr);
+
+  if (fread (data, 1, length, fp) < length)
+    fn_png_error (png_ptr, "Read error");
+}
+
+
 /* Load PNG image IMG for use on frame F.  Value is non-zero if
    successful.  */
 
@@ -5895,7 +5909,7 @@ png_load (f, img)
   if (!NILP (specified_data))
     fn_png_set_read_fn (png_ptr, (void *) &tbr, png_read_from_memory);
   else
-    fn_png_init_io (png_ptr, fp);
+    fn_png_set_read_fn (png_ptr, (void *) fp, png_read_from_file);
 
   fn_png_set_sig_bytes (png_ptr, sizeof sig);
   fn_png_read_info (png_ptr, info_ptr);
diff --git a/src/lread.c b/src/lread.c
index ffc7d87d977..773696ed946 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2846,7 +2846,7 @@ read_vector (readcharfun, bytecodeflag)
           if (i == COMPILED_BYTECODE)
             {
               if (!STRINGP (item))
-                error ("invalid byte code");
+                error ("Invalid byte code");
 
               /* Delay handling the bytecode slot until we know whether
                  it is lazily-loaded (we can tell by whether the
@@ -2868,7 +2868,7 @@ read_vector (readcharfun, bytecodeflag)
 
                   item = Fread (bytestr);
                   if (!CONSP (item))
-                    error ("invalid byte code");
+                    error ("Invalid byte code");
 
                   otem = XCONS (item);
                   bytestr = XCAR (item);
diff --git a/src/macfns.c b/src/macfns.c
index b26baf3eaf7..da1afa13bd8 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -208,7 +208,7 @@ check_x_frame (frame)
   CHECK_LIVE_FRAME (frame);
   f = XFRAME (frame);
   if (! FRAME_MAC_P (f))
-    error ("non-mac frame used");
+    error ("Non-Mac frame used");
   return f;
 }
 
@@ -4241,7 +4241,7 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
     NavTypeListHandle fileTypes = NULL;
     NavUserAction userAction;
     CFStringRef message=NULL, saveName = NULL;
-    
+
     BLOCK_INPUT;
     /* No need for a callback function because we are modal */
     NavGetDefaultDialogCreationOptions(&options);
@@ -4265,8 +4265,8 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
     if (!NILP (only_dir_p))
       status = NavCreateChooseFolderDialog(&options, mac_nav_event_callbackUPP,
                                            NULL, NULL, &dialogRef);
-    else if (NILP (mustmatch)) 
-      { 
+    else if (NILP (mustmatch))
+      {
         /* This is a save dialog */
         options.optionFlags |= kNavDontConfirmReplacement;
         options.actionButtonLabel = CFSTR ("Ok");
@@ -4283,7 +4283,7 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
             options.saveFileName = saveName;
             options.optionFlags |= kNavSelectDefaultLocation;
           }
-          status = NavCreatePutFileDialog(&options, 
+          status = NavCreatePutFileDialog(&options,
                                           'TEXT', kNavGenericSignature,
                                           mac_nav_event_callbackUPP, NULL,
                                           &dialogRef);
@@ -4295,7 +4295,7 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
                                            mac_nav_event_callbackUPP, NULL,
                                            NULL, NULL, &dialogRef);
       }
-    
+
     /* Set the default location and continue*/
     if (status == noErr)
       {
@@ -4307,7 +4307,7 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
         FSSpec defLoc;
         status = posix_pathname_to_fsspec (SDATA (ENCODE_FILE (dir)), &defLoc);
 #endif
-        if (status == noErr) 
+        if (status == noErr)
           {
 #ifdef MAC_OSX
             AECreateDesc(typeFSRef, &defLoc, sizeof(FSRef), &defLocAed);
@@ -4359,7 +4359,7 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
                 int len = strlen(filename);
                 if (len && filename[len-1] != '/')
                   filename[len++] = '/';
-                CFStringGetCString(reply.saveFileName, filename+len, 
+                CFStringGetCString(reply.saveFileName, filename+len,
                                    sizeof (filename) - len,
 #if MAC_OSX
                                    kCFStringEncodingUTF8
@@ -4387,11 +4387,11 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
   }
 
   UNGCPRO;
-  
+
   /* Make "Cancel" equivalent to C-g.  */
   if (NILP (file))
     Fsignal (Qquit, Qnil);
-  
+
   return unbind_to (count, file);
 }
 
diff --git a/src/process.c b/src/process.c
index 46808674a0d..5ef0dd3f5f2 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5835,7 +5835,7 @@ If PROCESS is a network process, inhibit handling of incoming traffic.  */)
     }
 #endif
 #ifndef SIGTSTP
-  error ("no SIGTSTP support");
+  error ("No SIGTSTP support");
 #else
   process_send_signal (process, SIGTSTP, current_group, 0);
 #endif
@@ -5869,7 +5869,7 @@ If PROCESS is a network process, resume handling of incoming traffic.  */)
 #ifdef SIGCONT
     process_send_signal (process, SIGCONT, current_group, 0);
 #else
-    error ("no SIGCONT support");
+    error ("No SIGCONT support");
 #endif
   return process;
 }
diff --git a/src/search.c b/src/search.c
index c1f2fd77cec..ae2d3234332 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2296,7 +2296,7 @@ since only regular expressions have distinguished subexpressions.  */)
                                 /* but some C compilers blew it */
 
   if (search_regs.num_regs <= 0)
-    error ("replace-match called before any match found");
+    error ("`replace-match' called before any match found");
 
   if (NILP (subexp))
     sub = 0;
@@ -2758,9 +2758,6 @@ is done.
 If optional third arg RESEAT is non-nil, any previous markers on the
 REUSE list will be modified to point to nowhere.
 
-If RESEAT is `evaporate', put markers back on the free list.
-Note: No other references to the markers must exist if you use this.
-
 Return value is undefined if the last search failed.  */)
   (integers, reuse, reseat)
      Lisp_Object integers, reuse, reseat;
@@ -2773,10 +2770,7 @@ Return value is undefined if the last search failed.  */)
     for (tail = reuse; CONSP (tail); tail = XCDR (tail))
       if (MARKERP (XCAR (tail)))
         {
-          if (EQ (reseat, Qevaporate))
-            free_marker (XCAR (tail));
-          else
-            unchain_marker (XMARKER (XCAR (tail)));
+          unchain_marker (XMARKER (XCAR (tail)));
           XSETCAR (tail, Qnil);
         }
 
@@ -2851,14 +2845,17 @@ Return value is undefined if the last search failed.  */)
   return reuse;
 }
 
+/* Internal usage only:
+   If RESEAT is `evaporate', put the markers back on the free list
+   immediately.  No other references to the markers must exist in this case,
+   so it is used only internally on the unwind stack and save-match-data from
+   Lisp.  */
 
 DEFUN ("set-match-data", Fset_match_data, Sset_match_data, 1, 2, 0,
        doc: /* Set internal data on last search match from elements of LIST.
 LIST should have been created by calling `match-data' previously.
 
-If optional arg RESEAT is non-nil, make markers on LIST point nowhere.
-If RESEAT is `evaporate', put the markers back on the free list.
-Note: No other references to the markers must exist if you use this.  */)
+If optional arg RESEAT is non-nil, make markers on LIST point nowhere.  */)
     (list, reseat)
      register Lisp_Object list, reseat;
 {
@@ -3026,6 +3023,7 @@ static Lisp_Object
 unwind_set_match_data (list)
      Lisp_Object list;
 {
+  /* It is safe to free (evaporate) the markers immediately.  */
   return Fset_match_data (list, Qevaporate);
 }
 
diff --git a/src/syntax.c b/src/syntax.c
index fa34c2433c1..52067b8f8fa 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -923,7 +923,7 @@ text property.  */)
   p = SDATA (string);
   code = (enum syntaxcode) syntax_spec_code[*p++];
   if (((int) code & 0377) == 0377)
-    error ("invalid syntax description letter: %c", p[-1]);
+    error ("Invalid syntax description letter: %c", p[-1]);
 
   if (code == Sinherit)
     return Qnil;
diff --git a/src/w32fns.c b/src/w32fns.c
index 6a2f98c4c7d..e9af1b8ce2f 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -329,7 +329,7 @@ check_x_frame (frame)
   CHECK_LIVE_FRAME (frame);
   f = XFRAME (frame);
   if (! FRAME_W32_P (f))
-    error ("non-w32 frame used");
+    error ("Non-W32 frame used");
   return f;
 }
 
@@ -359,7 +359,7 @@ check_x_display_info (frame)
       CHECK_LIVE_FRAME (frame);
       f = XFRAME (frame);
       if (! FRAME_W32_P (f))
-        error ("non-w32 frame used");
+        error ("Non-W32 frame used");
       return FRAME_W32_DISPLAY_INFO (f);
     }
 }
@@ -7771,7 +7771,7 @@ typedef struct
   DWORD FlagsEx;
 } NEWOPENFILENAME;
 
-    
+
 DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 5, 0,
        doc: /* Read file name, prompting with PROMPT in directory DIR.
 Use a file selection dialog.
@@ -7823,7 +7823,7 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
     NEWOPENFILENAME new_file_details;
     BOOL file_opened = FALSE;
     OPENFILENAME * file_details = &new_file_details.real_details;
-  
+
     /* Prevent redisplay.  */
     specbind (Qinhibit_redisplay, Qt);
     BLOCK_INPUT;
diff --git a/src/xdisp.c b/src/xdisp.c
index 6c11440dd1a..e92c3e9b1ce 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -320,7 +320,7 @@ Lisp_Object Vshow_trailing_whitespace;
 
 /* Non-nil means escape non-break space and hyphens.  */
 
-Lisp_Object Vshow_nonbreak_escape;
+Lisp_Object Vnobreak_char_display;
 
 #ifdef HAVE_WINDOW_SYSTEM
 extern Lisp_Object Voverflow_newline_into_fringe;
@@ -352,7 +352,7 @@ Lisp_Object Qescape_glyph;
 
 /* Name and number of the face used to highlight non-breaking spaces.  */
 
-Lisp_Object Qno_break_space;
+Lisp_Object Qnobreak_space;
 
 /* The symbol `image' which is the car of the lists used to represent
    images in Lisp.  */
@@ -5084,7 +5084,7 @@ get_next_display_element (it)
                        ? ((it->c >= 127
                            && it->len == 1)
                           || !CHAR_PRINTABLE_P (it->c)
-                          || (!NILP (Vshow_nonbreak_escape)
+                          || (!NILP (Vnobreak_char_display)
                               && (it->c == 0x8a0 || it->c == 0x8ad
                                   || it->c == 0x920 || it->c == 0x92d
                                   || it->c == 0xe20 || it->c == 0xe2d
@@ -5139,12 +5139,12 @@ get_next_display_element (it)
               /* Handle non-break space in the mode where it only gets
                  highlighting.  */
 
-              if (EQ (Vshow_nonbreak_escape, Qt)
+              if (EQ (Vnobreak_char_display, Qt)
                   && (it->c == 0x8a0 || it->c == 0x920
                       || it->c == 0xe20 || it->c == 0xf20))
                 {
                   /* Merge the no-break-space face into the current face.  */
-                  face_id = merge_faces (it->f, Qno_break_space, 0,
+                  face_id = merge_faces (it->f, Qnobreak_space, 0,
                                          it->face_id);
 
                   g = it->c = ' ';
@@ -5183,7 +5183,7 @@ get_next_display_element (it)
               /* Handle soft hyphens in the mode where they only get
                  highlighting.  */
 
-              if (! EQ (Vshow_nonbreak_escape, Qt)
+              if (EQ (Vnobreak_char_display, Qt)
                   && (it->c == 0x8ad || it->c == 0x92d
                       || it->c == 0xe2d || it->c == 0xf2d))
                 {
@@ -22785,8 +22785,8 @@ syms_of_xdisp ()
   staticpro (&Qtrailing_whitespace);
   Qescape_glyph = intern ("escape-glyph");
   staticpro (&Qescape_glyph);
-  Qno_break_space = intern ("no-break-space");
-  staticpro (&Qno_break_space);
+  Qnobreak_space = intern ("nobreak-space");
+  staticpro (&Qnobreak_space);
   Qimage = intern ("image");
   staticpro (&Qimage);
   QCmap = intern (":map");
@@ -22892,13 +22892,14 @@ wide as that tab on the display.  */);
 The face used for trailing whitespace is `trailing-whitespace'.  */);
   Vshow_trailing_whitespace = Qnil;
 
-  DEFVAR_LISP ("show-nonbreak-escape", &Vshow_nonbreak_escape,
-    doc: /* *Control highlighting of non-break space and soft hyphen.
-t means highlight the character itself (for non-break space,
-use face `non-break-space'.
+  DEFVAR_LISP ("nobreak-char-display", &Vnobreak_char_display,
+    doc: /* *Control highlighting of nobreak space and soft hyphen.
+t means highlight the character itself (for nobreak space,
+use face `nobreak-space'.
 nil means no highlighting.
-other values mean display the escape glyph before the character.  */);
-  Vshow_nonbreak_escape = Qt;
+other values mean display the escape glyph followed by an ordinary
+space or ordinary hyphen.  */);
+  Vnobreak_char_display = Qt;
 
   DEFVAR_LISP ("void-text-area-pointer", &Vvoid_text_area_pointer,
     doc: /* *The pointer shape to show in void text areas.
diff --git a/src/xfaces.c b/src/xfaces.c
index 78dc41116e4..b16b7eae824 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5929,7 +5929,7 @@ x_supports_face_attributes_p (f, attrs, def_face)
       face = FACE_FROM_ID (f, lookup_face (f, merged_attrs, 0, 0));
 
       if (! face)
-        error ("cannot make face");
+        error ("Cannot make face");
 
       /* If the font is the same, then not supported.  */
       if (face->font == def_face->font)
diff --git a/src/xselect.c b/src/xselect.c
index 7a1ceaabbb0..b0bd0bc97c9 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2136,7 +2136,7 @@ anything that the functions on `selection-converter-alist' know about.  */)
 {
   check_x ();
   CHECK_SYMBOL (selection_name);
-  if (NILP (selection_value)) error ("selection-value may not be nil");
+  if (NILP (selection_value)) error ("SELECTION-VALUE may not be nil");
   x_own_selection (selection_name, selection_value);
   return selection_value;
 }