From: Miles Bader <miles@gnu.org>
Date: Sat, 27 Oct 2007 09:12:07 +0000 (+0000)
Subject: Merge from emacs--devo--0
X-Git-Tag: emacs-pretest-23.0.90~8295^2~290
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=18cd1f1a08833b0baad21c1d7b13a6845d95cf57;p=emacs.git

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 902-908)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 131-137)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 261-262)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
---

18cd1f1a08833b0baad21c1d7b13a6845d95cf57
diff --cc lisp/loadup.el
index 8cbf65ff5ba,3bf021b017f..36bedfc67ec
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@@ -185,6 -192,9 +185,7 @@@
        (load "vms-patch")))
  (if (eq system-type 'windows-nt)
      (progn
 -      (load "international/ccl")
 -      (load "international/code-pages")
+       (load "w32-vars")
        (load "term/w32-win")
        (load "ls-lisp")
        (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
diff --cc lisp/ps-print.el
index 631bfabee03,49b0960f9bb..b0f3d09fc38
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@@ -1449,9 -1448,8 +1449,9 @@@ Please send all bug fixes and enhanceme
  (or (featurep 'lisp-float-type)
      (error "`ps-print' requires floating point support"))
  
 +
  (let ((case-fold-search t))
-   (cond ((string-match "XEmacs" emacs-version))
+   (cond ((featurep 'xemacs))
  	((string-match "Lucid" emacs-version)
  	 (error "`ps-print' doesn't support Lucid"))
  	((string-match "Epoch" emacs-version)
diff --cc lisp/term/w32-win.el
index 34fdac08713,6a2ea13be38..b233d0d62e0
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@@ -78,6 -78,8 +78,7 @@@
  (require 'select)
  (require 'menu-bar)
  (require 'dnd)
 -(require 'code-pages)
+ (require 'w32-vars)
  
  ;; Keep an obsolete alias for w32-focus-frame in case it is used by code
  ;; outside Emacs.
diff --cc nt/configure.bat
index 686685d0029,ef0a746949b..bc3daa6e9b0
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@@ -482,9 -475,12 +484,13 @@@ if (%nodebug%) == (Y) echo NODEBUG=1 >>
  if (%noopt%) == (Y) echo NOOPT=1 >>config.settings
  if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings
  if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix%>>config.settings
- if not "(%usercflags%)" == "()" echo USER_CFLAGS=%usercflags%>>config.settings
- if not "(%userldflags%)" == "()" echo USER_LDFLAGS=%userldflags%>>config.settings
+ rem We go thru docflags because usercflags could be "-DFOO=bar" -something
+ rem and the if command cannot cope with this
+ for %%v in (%usercflags%) do if not (%%v)==() set docflags=Y
+ if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags%>>config.settings
+ for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y
+ if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags%>>config.settings
 +if (%usefontbackend%) == (Y) echo USE_FONTBACKEND=1 >>config.settings
  echo # End of settings from configure.bat>>config.settings
  echo. >>config.settings
  
diff --cc src/frame.c
index 5c89c96a239,a8efa11f728..eecc6878c55
--- a/src/frame.c
+++ b/src/frame.c
@@@ -114,12 -110,8 +114,11 @@@ Lisp_Object Qleft_fringe, Qright_fringe
  Lisp_Object Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list;
  Lisp_Object Qtty_color_mode;
  Lisp_Object Qtty, Qtty_type;
- Lisp_Object Qwindow_system;
  
  Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth;
 +#ifdef USE_FONT_BACKEND
 +Lisp_Object Qfont_backend;
 +#endif	/* USE_FONT_BACKEND */
  
  Lisp_Object Qinhibit_face_set_after_frame_default;
  Lisp_Object Qface_set_after_frame_default;
diff --cc src/lisp.h
index 8a0b13a72a1,24b908df8e9..62c629bd4a8
--- a/src/lisp.h
+++ b/src/lisp.h
@@@ -3157,8 -3169,8 +3157,9 @@@ extern Lisp_Object Qinsert_in_front_hoo
  EXFUN (Fnext_single_property_change, 4);
  EXFUN (Fnext_single_char_property_change, 4);
  EXFUN (Fprevious_single_property_change, 4);
 +EXFUN (Fget_text_property, 3);
  EXFUN (Fput_text_property, 5);
+ EXFUN (Fget_text_property, 3);
  EXFUN (Fprevious_char_property_change, 2);
  EXFUN (Fnext_char_property_change, 2);
  extern void report_interval_modification P_ ((Lisp_Object, Lisp_Object));
diff --cc src/w32fns.c
index de5b6db3d77,e5c730a528c..288b1f96665
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@@ -27,9 -27,13 +27,10 @@@ Boston, MA 02110-1301, USA.  *
  #include <stdio.h>
  #include <limits.h>
  #include <errno.h>
+ #include <math.h>
  
  #include "lisp.h"
 -#include "charset.h"
 -#include "dispextern.h"
  #include "w32term.h"
 -#include "keyboard.h"
  #include "frame.h"
  #include "window.h"
  #include "buffer.h"