diff options
author | Miles Bader <miles@gnu.org> | 2005-07-07 12:43:14 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2005-07-07 12:43:14 +0000 |
commit | d3e4babdd1267fb5690a17949196640a47c6f159 (patch) | |
tree | 968a42dfa187e492f9ce188aaf669d0cebf4bfe2 /src | |
parent | eeb88b27e1dbd3f412aa684d44e4a784f6e536a2 (diff) | |
parent | a5717394ea6fbd7ea179c362646f4495f88245cb (diff) | |
download | emacs-d3e4babdd1267fb5690a17949196640a47c6f159.tar.gz |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 459-473)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 86-87)
- Update from CVS
Diffstat (limited to 'src')
295 files changed, 908 insertions, 664 deletions
diff --git a/src/.gdbinit b/src/.gdbinit index f1cc2d35d4b..68042505ed5 100644 --- a/src/.gdbinit +++ b/src/.gdbinit @@ -15,8 +15,8 @@ # # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. # Force loading of symbols, enough to give us gdb_valbits etc. set main diff --git a/src/COPYING b/src/COPYING index d60c31a97a5..3912109b5cd 100644 --- a/src/COPYING +++ b/src/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. @@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/src/ChangeLog b/src/ChangeLog index 2d312756daf..8501f8fd9dc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,88 @@ +2005-07-06 Richard M. Stallman <rms@gnu.org> + + * window.c (Frecenter): When arg is inside the scroll margin, + move it out of the margin. + +2005-07-06 Jason Rumney <jasonr@gnu.org> + + * w32console.c (initialize_w32_display): Detect when the console + dimensions are insane, and default to 80x25 instead. + (w32_use_full_screen_buffer): default to NIL. + +2005-07-06 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macterm.c (mac_draw_vertical_window_border): Use foreground of + VERTICAL_BORDER_FACE_ID for vertical border line. + (mac_encode_char): Call check_ccl_update in advance. + (mac_to_x_fontname, x_font_name_to_mac_font_name) + (init_font_name_table, mac_do_list_fonts, XLoadQueryFont): Don't + assume that font family length is less than 32. + (x_compute_min_glyph_bounds): Make static. + (x_load_font): Never set fonts_changed_p to zero. + +2005-07-04 Lute Kamstra <lute@gnu.org> + + * Update FSF's address in GPL notices. + +2005-07-03 Richard M. Stallman <rms@gnu.org> + + * xdisp.c (try_window): Fix previous change in how it handles + a partially-visible line or one only partly past the margin. + + * window.c (window_scroll_pixel_based): Take account + of this_scroll_margin when finding point when scrolling up. + +2005-06-29 Ralf Angeli <angeli@iwi.uni-sb.de> + + * window.c (window_scroll_pixel_based, window_scroll_line_based): + Handle `scroll-preserve-screen-position' non-nil, non-t specially. + (syms_of_window): <scroll-preserve-screen-position>: Doc fix. + +2005-07-02 Juri Linkov <juri@jurta.org> + + * w32term.c (w32_draw_vertical_window_border): Use foreground of + VERTICAL_BORDER_FACE_ID for vertical border line. + +2005-07-02 Eli Zaretskii <eliz@gnu.org> + + * fileio.c (Fcopy_file): Rearrange the code that calls fchown and + fchmod so that chmod doesn't get called on MSDOS before the file + is closed. + +2005-07-01 Jason Rumney <jasonr@gnu.org> + + * w32term.c (cleartype_active): New flag for enabling sub-pixel + workaround. + (w32_initialize): Initialize it. + (w32_native_per_char_metric): Allow a couple of extra pixels when + Cleartype is active. + + * w32term.c (w32_initialize): Move check for screen reader here + from syms_of_w32term. + +2005-06-30 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * xterm.c (handle_one_xevent): bzero compose_status when nbytes + is not zero. + +2005-07-01 Masatake YAMATO <jet@gyve.org> + + * emacs.c (main): Passing ADD_NO_RANDOMIZE to + `personality'. + +2005-06-30 Juri Linkov <juri@jurta.org> + + * xdisp.c (x_draw_vertical_border): If left fringe is not present + decrease x coord of vertical border by 1 pixel to not occupy text + area of the right window. + + * xterm.c (x_draw_vertical_window_border): Use foreground of + VERTICAL_BORDER_FACE_ID for vertical border line. + + * term.c (turn_on_face): In standout mode apply specified + fg to bg, and specified bg to fg (this makes the logic of + inversion on terminal consistent with X). + 2005-06-29 Juanma Barranquero <lekktu@gmail.com> * eval.c (user_variable_p_eh): New function. diff --git a/src/Makefile.in b/src/Makefile.in index 89ea1da33e0..ebbc16534f1 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -16,8 +16,8 @@ # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. # Note that this file is edited by msdos/sed1v2.inp for MSDOS. That diff --git a/src/abbrev.c b/src/abbrev.c index 4fd82995393..94e915827cf 100644 --- a/src/abbrev.c +++ b/src/abbrev.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/alloc.c b/src/alloc.c index a491185a4ed..26d41c12b50 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include <stdio.h> diff --git a/src/atimer.c b/src/atimer.c index ff5b8faaf36..9ac6d529b99 100644 --- a/src/atimer.c +++ b/src/atimer.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include <signal.h> diff --git a/src/atimer.h b/src/atimer.h index f987a47a6bd..5057eb2be24 100644 --- a/src/atimer.h +++ b/src/atimer.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef EMACS_ATIMER_H #define EMACS_ATIMER_H diff --git a/src/blockinput.h b/src/blockinput.h index 6aa865ea9be..36559715533 100644 --- a/src/blockinput.h +++ b/src/blockinput.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef EMACS_BLOCKINPUT_H #define EMACS_BLOCKINPUT_H diff --git a/src/buffer.c b/src/buffer.c index 381cd06c0f3..4001801922f 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/buffer.h b/src/buffer.h index 0da6b5c4953..d97640d6cea 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Accessing the parameters of the current buffer. */ diff --git a/src/bytecode.c b/src/bytecode.c index 80fb5e2208e..42b2cdfd635 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. hacked on by jwz@lucid.com 17-jun-91 o added a compile-time switch to turn on simple sanity checking; diff --git a/src/callint.c b/src/callint.c index dea776e0f1c..10db39ddce4 100644 --- a/src/callint.c +++ b/src/callint.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/callproc.c b/src/callproc.c index 0c8089c9322..fe897ba3ea6 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/casefiddle.c b/src/casefiddle.c index 889c3879cb4..95ac6669b41 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/casetab.c b/src/casetab.c index d0e0e137462..134f19fff06 100644 --- a/src/casetab.c +++ b/src/casetab.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Written by Howard Gayle. */ diff --git a/src/category.c b/src/category.c index 226fb8f978f..cd1be5a8da0 100644 --- a/src/category.c +++ b/src/category.c @@ -19,8 +19,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Here we handle three objects: category, category set, and category diff --git a/src/category.h b/src/category.h index adad3d713f8..c025d409549 100644 --- a/src/category.h +++ b/src/category.h @@ -19,8 +19,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* We introduce here three types of object: category, category set, diff --git a/src/ccl.c b/src/ccl.c index c5d4e4165c1..6359e947d27 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -20,8 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/ccl.h b/src/ccl.h index 6d01beeb6b7..b14c18b8f25 100644 --- a/src/ccl.h +++ b/src/ccl.h @@ -19,8 +19,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef EMACS_CCL_H #define EMACS_CCL_H diff --git a/src/charset.c b/src/charset.c index e7b080084b2..bf4dfc5bd48 100644 --- a/src/charset.c +++ b/src/charset.c @@ -20,8 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/charset.h b/src/charset.h index f9519068948..4f342a3fbbe 100644 --- a/src/charset.h +++ b/src/charset.h @@ -20,8 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef EMACS_CHARSET_H #define EMACS_CHARSET_H @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Holds the minimum and maximum costs for the parametrized capabilities. */ struct parmcap diff --git a/src/cmds.c b/src/cmds.c index 1ac81af45a1..9e95d1443fb 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/coding.c b/src/coding.c index 66430553a84..77a344eba72 100644 --- a/src/coding.c +++ b/src/coding.c @@ -20,8 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /*** TABLE OF CONTENTS *** diff --git a/src/coding.h b/src/coding.h index c537ef8376c..aab23a2fbf6 100644 --- a/src/coding.h +++ b/src/coding.h @@ -20,8 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef EMACS_CODING_H #define EMACS_CODING_H diff --git a/src/commands.h b/src/commands.h index b9b1ad41933..9486467e2fe 100644 --- a/src/commands.h +++ b/src/commands.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #define Ctl(c) ((c)&037) diff --git a/src/composite.c b/src/composite.c index 17144f25cd4..63d54b93a34 100644 --- a/src/composite.c +++ b/src/composite.c @@ -20,8 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include "lisp.h" diff --git a/src/composite.h b/src/composite.h index 5d4dd024ce6..550115edd44 100644 --- a/src/composite.h +++ b/src/composite.h @@ -20,8 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef EMACS_COMPOSITE_H #define EMACS_COMPOSITE_H diff --git a/src/config.in b/src/config.in index 93ee6488e0c..d3369641a8f 100644 --- a/src/config.in +++ b/src/config.in @@ -18,8 +18,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* No code in Emacs #includes config.h twice, but some bits of code diff --git a/src/data.c b/src/data.c index cb7f1649c00..8f98e6fbd6b 100644 --- a/src/data.c +++ b/src/data.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/dired.c b/src/dired.c index b9e4197e120..4594d96e359 100644 --- a/src/dired.c +++ b/src/dired.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/dispextern.h b/src/dispextern.h index c049b17ce56..433a348438a 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* New redisplay written by Gerd Moellmann <gerd@gnu.org>. */ diff --git a/src/dispnew.c b/src/dispnew.c index c17ef2a4d69..345c3aa7640 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include <signal.h> diff --git a/src/disptab.h b/src/disptab.h index e9c9805ea65..0ab8a5afa36 100644 --- a/src/disptab.h +++ b/src/disptab.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Access the slots of a display-table, according to their purpose. */ diff --git a/src/doc.c b/src/doc.c index b4ae05ca6c4..f07ff405c3d 100644 --- a/src/doc.c +++ b/src/doc.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/doprnt.c b/src/doprnt.c index 873adca34e0..1d103f755b2 100644 --- a/src/doprnt.c +++ b/src/doprnt.c @@ -17,8 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/dosfns.c b/src/dosfns.c index 3b3aac0efad..849ec232cfa 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -17,8 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/dosfns.h b/src/dosfns.h index 24d214fc1b3..594c3d980c6 100644 --- a/src/dosfns.h +++ b/src/dosfns.h @@ -19,8 +19,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ extern EMACS_INT dos_hyper_key; extern EMACS_INT dos_super_key; diff --git a/src/ecrt0.c b/src/ecrt0.c index 209748c8c9e..95b69b11c01 100644 --- a/src/ecrt0.c +++ b/src/ecrt0.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The standard Vax 4.2 Unix crt0.c cannot be used for Emacs diff --git a/src/editfns.c b/src/editfns.c index 92a5c395b7e..7333a5b8dc7 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/emacs.c b/src/emacs.c index 013dd1c8918..398837a98e6 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> @@ -918,7 +918,13 @@ main (argc, argv { /* Set this so we only do this once. */ putenv("EMACS_HEAP_EXEC=true"); - personality (PER_LINUX32); + + /* A flag to turn off address randomization which is introduced + in linux kernel shipped with fedora core 4 */ +#define ADD_NO_RANDOMIZE 0x0040000 + personality (PER_LINUX32 | ADD_NO_RANDOMIZE); +#undef ADD_NO_RANDOMIZE + execvp (argv[0], argv); /* If the exec fails, try to dump anyway. */ diff --git a/src/epaths.in b/src/epaths.in index 00a1a1d04f5..be91cb485ae 100644 --- a/src/epaths.in +++ b/src/epaths.in @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The default search path for Lisp function "load". This sets load-path. */ diff --git a/src/eval.c b/src/eval.c index 17e9f7f4360..f625258229e 100644 --- a/src/eval.c +++ b/src/eval.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/fileio.c b/src/fileio.c index 112c879c1c5..be6bf37ad94 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> @@ -2526,7 +2526,7 @@ uid and gid of FILE to NEWNAME. */) copyable by us. */ input_file_statable_p = (fstat (ifd, &st) >= 0); -#if !defined (DOS_NT) || __DJGPP__ > 1 +#if !defined (MSDOS) || __DJGPP__ > 1 if (out_st.st_mode != 0 && st.st_dev == out_st.st_dev && st.st_ino == out_st.st_ino) { @@ -2579,25 +2579,16 @@ uid and gid of FILE to NEWNAME. */) report_file_error ("I/O error", Fcons (newname, Qnil)); immediate_quit = 0; - /* Preserve the owner and group, if requested. */ - if (input_file_statable_p && ! NILP (preserve_uid_gid)) - fchown (ofd, st.st_uid, st.st_gid); - +#ifndef MSDOS + /* Preserve the original file modes, and if requested, also its + owner and group. */ if (input_file_statable_p) { -#ifndef MSDOS + if (! NILP (preserve_uid_gid)) + fchown (ofd, st.st_uid, st.st_gid); fchmod (ofd, st.st_mode & 07777); -#else /* MSDOS */ -#if defined (__DJGPP__) && __DJGPP__ > 1 - /* In DJGPP v2.0 and later, fstat usually returns true file mode bits, - and if it can't, it tells so. Otherwise, under MSDOS we usually - get only the READ bit, which will make the copied file read-only, - so it's better not to chmod at all. */ - if ((_djstat_flags & _STFAIL_WRITEBIT) == 0) - chmod (SDATA (encoded_newname), st.st_mode & 07777); -#endif /* DJGPP version 2 or newer */ -#endif /* MSDOS */ } +#endif /* not MSDOS */ /* Closing the output clobbers the file times on some systems. */ if (emacs_close (ofd) < 0) @@ -2619,7 +2610,19 @@ uid and gid of FILE to NEWNAME. */) } emacs_close (ifd); -#endif /* WINDOWSNT */ + +#if defined (__DJGPP__) && __DJGPP__ > 1 + if (input_file_statable_p) + { + /* In DJGPP v2.0 and later, fstat usually returns true file mode bits, + and if it can't, it tells so. Otherwise, under MSDOS we usually + get only the READ bit, which will make the copied file read-only, + so it's better not to chmod at all. */ + if ((_djstat_flags & _STFAIL_WRITEBIT) == 0) + chmod (SDATA (encoded_newname), st.st_mode & 07777); + } +#endif /* DJGPP version 2 or newer */ +#endif /* not WINDOWSNT */ /* Discard the unwind protects. */ specpdl_ptr = specpdl + count; diff --git a/src/filelock.c b/src/filelock.c index 9cdaea4ef13..cddce66a1d4 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/filemode.c b/src/filemode.c index 058880d6699..130cbace773 100644 --- a/src/filemode.c +++ b/src/filemode.c @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H diff --git a/src/firstfile.c b/src/firstfile.c index faa192257ba..cf6dbf3e888 100644 --- a/src/firstfile.c +++ b/src/firstfile.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/floatfns.c b/src/floatfns.c index a64186611d4..529e7b76e39 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* ANSI C requires only these float functions: diff --git a/src/fns.c b/src/fns.c index fc33c610c57..efca68318e4 100644 --- a/src/fns.c +++ b/src/fns.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/fontset.c b/src/fontset.c index 2d3df6c6e52..5ccc0dceb60 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -20,8 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* #define FONTSET_DEBUG */ diff --git a/src/fontset.h b/src/fontset.h index 2270d6aa7da..ad7ee334e74 100644 --- a/src/fontset.h +++ b/src/fontset.h @@ -19,8 +19,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef EMACS_FONTSET_H #define EMACS_FONTSET_H diff --git a/src/frame.c b/src/frame.c index 76ccc8bb323..a9f006ae8e0 100644 --- a/src/frame.c +++ b/src/frame.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/frame.h b/src/frame.h index e3379f4f5fc..8e4c77f9af4 100644 --- a/src/frame.h +++ b/src/frame.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Don't multiply include: dispextern.h includes macterm.h which includes frame.h some emacs source includes both dispextern.h and diff --git a/src/fringe.c b/src/fringe.c index 3a9d8d306ea..1a130f428f3 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include <stdio.h> diff --git a/src/getloadavg.c b/src/getloadavg.c index 9a104cee7d8..191f7d4244f 100644 --- a/src/getloadavg.c +++ b/src/getloadavg.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Compile-time symbols that this file uses: diff --git a/src/getpagesize.h b/src/getpagesize.h index 269a2ff17fd..20f19279cd0 100644 --- a/src/getpagesize.h +++ b/src/getpagesize.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef HAVE_GETPAGESIZE diff --git a/src/gmalloc.c b/src/gmalloc.c index eae83a74eb6..08de77df0e0 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -20,8 +20,8 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. +not, write to the Free Software Foundation, Inc., 51 Franklin Street, +Fifth Floor, Boston, MA 02110-1301, USA. The author may be reached (Email) at the address mike@ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ @@ -339,8 +339,8 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. +not, write to the Free Software Foundation, Inc., 51 Franklin Street, +Fifth Floor, Boston, MA 02110-1301, USA. The author may be reached (Email) at the address mike@ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ @@ -942,8 +942,8 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. +not, write to the Free Software Foundation, Inc., 51 Franklin Street, +Fifth Floor, Boston, MA 02110-1301, USA. The author may be reached (Email) at the address mike@ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ @@ -1261,8 +1261,8 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. +not, write to the Free Software Foundation, Inc., 51 Franklin Street, +Fifth Floor, Boston, MA 02110-1301, USA. The author may be reached (Email) at the address mike@ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ @@ -1506,8 +1506,8 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. +not, write to the Free Software Foundation, Inc., 51 Franklin Street, +Fifth Floor, Boston, MA 02110-1301, USA. The author may be reached (Email) at the address mike@ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ @@ -1546,7 +1546,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with the GNU C Library; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ #ifndef _MALLOC_INTERNAL #define _MALLOC_INTERNAL @@ -1602,8 +1603,8 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ +not, write to the Free Software Foundation, Inc., 51 Franklin Street, +Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _MALLOC_INTERNAL #define _MALLOC_INTERNAL @@ -1702,8 +1703,8 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. +not, write to the Free Software Foundation, Inc., 51 Franklin Street, +Fifth Floor, Boston, MA 02110-1301, USA. The author may be reached (Email) at the address mike@ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ @@ -1769,8 +1770,8 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. +not, write to the Free Software Foundation, Inc., 51 Franklin Street, +Fifth Floor, Boston, MA 02110-1301, USA. The author may be reached (Email) at the address mike@ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ diff --git a/src/gtkutil.c b/src/gtkutil.c index 8bd83e40043..1cb1004f576 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include "config.h" diff --git a/src/gtkutil.h b/src/gtkutil.h index 44e82885d7f..08ba9ee1314 100644 --- a/src/gtkutil.h +++ b/src/gtkutil.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef GTKUTIL_H #define GTKUTIL_H diff --git a/src/image.c b/src/image.c index b2d0cf4ff50..928ec0437aa 100644 --- a/src/image.c +++ b/src/image.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include <stdio.h> diff --git a/src/indent.c b/src/indent.c index 8b8bf924a94..721b9ea640f 100644 --- a/src/indent.c +++ b/src/indent.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include "lisp.h" diff --git a/src/indent.h b/src/indent.h index 8c2d1f36adb..39db7b8cf5f 100644 --- a/src/indent.h +++ b/src/indent.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* We introduce new member `tab_offset'. We need it because of the existence of wide-column characters. There is a case that the diff --git a/src/insdel.c b/src/insdel.c index c2ee9a94674..b4ec4d4ee34 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/intervals.c b/src/intervals.c index 4a9b51f7e7e..5878ce5e4f1 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* NOTES: diff --git a/src/intervals.h b/src/intervals.h index f55a68667f3..82943a9daae 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include "dispextern.h" diff --git a/src/keyboard.c b/src/keyboard.c index a3403c586a3..1ab4be0347c 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include <signal.h> diff --git a/src/keyboard.h b/src/keyboard.h index 8df3a2452a7..f5be3f28cf4 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Length of echobuf field in each KBOARD. */ diff --git a/src/keymap.c b/src/keymap.c index 3484186404a..090996c7e0d 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/keymap.h b/src/keymap.h index bec39186863..4fcbffbed5a 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef KEYMAP_H #define KEYMAP_H diff --git a/src/lastfile.c b/src/lastfile.c index d6292e30040..d03dc2c8346 100644 --- a/src/lastfile.c +++ b/src/lastfile.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* How this works: diff --git a/src/lisp.h b/src/lisp.h index d523f98f937..890359750ec 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef EMACS_LISP_H #define EMACS_LISP_H diff --git a/src/lread.c b/src/lread.c index 389bc04ddaa..72f758e0735 100644 --- a/src/lread.c +++ b/src/lread.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/m/7300.h b/src/m/7300.h index 17dde0c9180..fa95b3d9c4e 100644 --- a/src/m/7300.h +++ b/src/m/7300.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/acorn.h b/src/m/acorn.h index 6f0a77be44c..66978329d75 100644 --- a/src/m/acorn.h +++ b/src/m/acorn.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h index 213af43266b..cf0afd90bb5 100644 --- a/src/m/alliant-2800.h +++ b/src/m/alliant-2800.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/alliant.h b/src/m/alliant.h index c9c1c70cc95..a32e514271d 100644 --- a/src/m/alliant.h +++ b/src/m/alliant.h @@ -18,8 +18,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of operating system this machine is likely to run. diff --git a/src/m/alpha.h b/src/m/alpha.h index 3e1d378b292..aff6182270f 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/altos.h b/src/m/altos.h index b71d006f241..e3cf0898773 100644 --- a/src/m/altos.h +++ b/src/m/altos.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/amdahl.h b/src/m/amdahl.h index 37cb8c0d362..8b32a2e64d1 100644 --- a/src/m/amdahl.h +++ b/src/m/amdahl.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* This file for amdahl_uts created by modifying the template.h diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h index 0192afc9d45..61b18dcc319 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/apollo.h b/src/m/apollo.h index e28ffef3379..8fa91c004c5 100644 --- a/src/m/apollo.h +++ b/src/m/apollo.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/arm.h b/src/m/arm.h index d3a95521e79..1ebcf3be4a4 100644 --- a/src/m/arm.h +++ b/src/m/arm.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ diff --git a/src/m/att3b.h b/src/m/att3b.h index 559ac2f3c6c..949e6b1d01b 100644 --- a/src/m/att3b.h +++ b/src/m/att3b.h @@ -17,8 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/aviion.h b/src/m/aviion.h index 7705ef645fb..13a262423b0 100644 --- a/src/m/aviion.h +++ b/src/m/aviion.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word diff --git a/src/m/celerity.h b/src/m/celerity.h index 55beedb7c41..0b0bb020122 100644 --- a/src/m/celerity.h +++ b/src/m/celerity.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/clipper.h b/src/m/clipper.h index dc4dd0c2df8..5da09e02fb8 100644 --- a/src/m/clipper.h +++ b/src/m/clipper.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h index d44eff6700c..cb344f98f7f 100644 --- a/src/m/cnvrgnt.h +++ b/src/m/cnvrgnt.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word diff --git a/src/m/convex.h b/src/m/convex.h index a871d4ac214..97b291743dc 100644 --- a/src/m/convex.h +++ b/src/m/convex.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/cydra5.h b/src/m/cydra5.h index 12b757305ba..e2813dc2a4b 100644 --- a/src/m/cydra5.h +++ b/src/m/cydra5.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/delta88k.h b/src/m/delta88k.h index 89889824fd1..ab0a48a4e31 100644 --- a/src/m/delta88k.h +++ b/src/m/delta88k.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/dpx2.h b/src/m/dpx2.h index 1a2b99cdffc..7a24c3940d3 100644 --- a/src/m/dpx2.h +++ b/src/m/dpx2.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of operating system this machine is likely to run. diff --git a/src/m/dual.h b/src/m/dual.h index 392cb64eb49..253c12bec52 100644 --- a/src/m/dual.h +++ b/src/m/dual.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of operating system this machine is likely to run. diff --git a/src/m/elxsi.h b/src/m/elxsi.h index 1795d9815d3..f8de3609690 100644 --- a/src/m/elxsi.h +++ b/src/m/elxsi.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of operating system this machine is likely to run. diff --git a/src/m/ews4800.h b/src/m/ews4800.h index b782542348c..dcb46bf83d8 100644 --- a/src/m/ews4800.h +++ b/src/m/ews4800.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #undef LIB_STANDARD #undef C_DEBUG_SWITCH diff --git a/src/m/gould-np1.h b/src/m/gould-np1.h index 145d682afb1..4a267865085 100644 --- a/src/m/gould-np1.h +++ b/src/m/gould-np1.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of operating system this machine is likely to run. diff --git a/src/m/gould.h b/src/m/gould.h index eeac2aef2f6..3a382ca0c1b 100644 --- a/src/m/gould.h +++ b/src/m/gould.h @@ -21,8 +21,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/hp800.h b/src/m/hp800.h index 8f08ed3b617..64243f4be31 100644 --- a/src/m/hp800.h +++ b/src/m/hp800.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h index 24c9a521d0c..8886aec204c 100644 --- a/src/m/hp9000s300.h +++ b/src/m/hp9000s300.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/i860.h b/src/m/i860.h index 9d56b886f62..66ca2b8fa66 100644 --- a/src/m/i860.h +++ b/src/m/i860.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/ia64.h b/src/m/ia64.h index 947bb9d4562..33d843c773f 100644 --- a/src/m/ia64.h +++ b/src/m/ia64.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #define BITS_PER_LONG 64 #define BITS_PER_EMACS_INT 64 diff --git a/src/m/ibm370aix.h b/src/m/ibm370aix.h index 3fb228afa18..b958656c3e4 100644 --- a/src/m/ibm370aix.h +++ b/src/m/ibm370aix.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include "ibmps2-aix.h" diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h index eb843ffe71b..d2202d65472 100644 --- a/src/m/ibmps2-aix.h +++ b/src/m/ibmps2-aix.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h index 5be14b04884..b76d03bc0b7 100644 --- a/src/m/ibmrs6000.h +++ b/src/m/ibmrs6000.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h index 8bce9fb6f69..b9ea0e6208f 100644 --- a/src/m/ibmrt-aix.h +++ b/src/m/ibmrt-aix.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h index 9c262640570..1388a46b001 100644 --- a/src/m/ibmrt.h +++ b/src/m/ibmrt.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/ibms390.h b/src/m/ibms390.h index 8797a49d307..af7fbb8dfbf 100644 --- a/src/m/ibms390.h +++ b/src/m/ibms390.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/intel386.h b/src/m/intel386.h index e240beb91a3..c63dae7af0b 100644 --- a/src/m/intel386.h +++ b/src/m/intel386.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/iris4d.h b/src/m/iris4d.h index 8d3b7a883bd..a13a6f8c2ff 100644 --- a/src/m/iris4d.h +++ b/src/m/iris4d.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word diff --git a/src/m/irist.h b/src/m/irist.h index d2b9dd28314..71726977b23 100644 --- a/src/m/irist.h +++ b/src/m/irist.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h index ef481e13f2b..9b35f03ea70 100644 --- a/src/m/isi-ov.h +++ b/src/m/isi-ov.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/m68k.h b/src/m/m68k.h index ce7b268bbec..9fdcf1511b8 100644 --- a/src/m/m68k.h +++ b/src/m/m68k.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following three symbols give information on diff --git a/src/m/macppc.h b/src/m/macppc.h index c068fca32a9..36022af3e52 100644 --- a/src/m/macppc.h +++ b/src/m/macppc.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word is the most significant byte. */ diff --git a/src/m/masscomp.h b/src/m/masscomp.h index 34ea78696c1..4582e29b6bd 100644 --- a/src/m/masscomp.h +++ b/src/m/masscomp.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/mega68.h b/src/m/mega68.h index e86a5048680..ba7ee6b48d4 100644 --- a/src/m/mega68.h +++ b/src/m/mega68.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/mg1.h b/src/m/mg1.h index 5a6250c3c31..47d34f43768 100644 --- a/src/m/mg1.h +++ b/src/m/mg1.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h index 11b1f971d27..f00790210c9 100644 --- a/src/m/mips-siemens.h +++ b/src/m/mips-siemens.h @@ -20,8 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/mips.h b/src/m/mips.h index cca45868178..e868423642c 100644 --- a/src/m/mips.h +++ b/src/m/mips.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/news.h b/src/m/news.h index 1a594ad82a7..1d2585c09a0 100644 --- a/src/m/news.h +++ b/src/m/news.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/next.h b/src/m/next.h index 1e8a3d3a31c..2f2952e10f4 100644 --- a/src/m/next.h +++ b/src/m/next.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Say this machine is a next if not previously defined */ diff --git a/src/m/nh3000.h b/src/m/nh3000.h index d6c09bd65b5..7be5c5dc7db 100644 --- a/src/m/nh3000.h +++ b/src/m/nh3000.h @@ -17,8 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* This file manually constructed for Harris Night Hawk 4000 (and 5000) * series Motorola 88100 and 88110 based machines. diff --git a/src/m/nh4000.h b/src/m/nh4000.h index 70804ef2c36..3d8794b2802 100644 --- a/src/m/nh4000.h +++ b/src/m/nh4000.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* This file manually constructed for Harris Night Hawk 4000 (and 5000) * series Motorola 88100 and 88110 based machines. diff --git a/src/m/ns16000.h b/src/m/ns16000.h index 549f648c7f8..07fff86502b 100644 --- a/src/m/ns16000.h +++ b/src/m/ns16000.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/ns32000.h b/src/m/ns32000.h index 214954b631a..9a135fe2d9f 100644 --- a/src/m/ns32000.h +++ b/src/m/ns32000.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ diff --git a/src/m/nu.h b/src/m/nu.h index 44abc929053..8ca03155314 100644 --- a/src/m/nu.h +++ b/src/m/nu.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/orion.h b/src/m/orion.h index 76519f6fe68..e4fa8529664 100644 --- a/src/m/orion.h +++ b/src/m/orion.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/orion105.h b/src/m/orion105.h index c58f9222068..d0adaba70ec 100644 --- a/src/m/orion105.h +++ b/src/m/orion105.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/pfa50.h b/src/m/pfa50.h index c6762a93120..be430d25fdc 100644 --- a/src/m/pfa50.h +++ b/src/m/pfa50.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word diff --git a/src/m/plexus.h b/src/m/plexus.h index b7012c750d6..a2f6cc545a0 100644 --- a/src/m/plexus.h +++ b/src/m/plexus.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/powermac.h b/src/m/powermac.h index dc698675eaa..c41003ae61c 100644 --- a/src/m/powermac.h +++ b/src/m/powermac.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h index 4733156337a..34096a37d18 100644 --- a/src/m/powerpcle.h +++ b/src/m/powerpcle.h @@ -15,7 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of operating system this machine is likely to run. diff --git a/src/m/pyramid.h b/src/m/pyramid.h index 7ba6a9e058e..7e0db61ec59 100644 --- a/src/m/pyramid.h +++ b/src/m/pyramid.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/sequent-ptx.h b/src/m/sequent-ptx.h index a72c7055780..57d255a861e 100644 --- a/src/m/sequent-ptx.h +++ b/src/m/sequent-ptx.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/sequent.h b/src/m/sequent.h index 7e45c4f4fda..7c572f54f68 100644 --- a/src/m/sequent.h +++ b/src/m/sequent.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/sparc.h b/src/m/sparc.h index 8656152fb7a..6926aced07b 100644 --- a/src/m/sparc.h +++ b/src/m/sparc.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of operating system this machine is likely to run. diff --git a/src/m/sps7.h b/src/m/sps7.h index ba4eae18510..3bd0c94bccd 100644 --- a/src/m/sps7.h +++ b/src/m/sps7.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/sr2k.h b/src/m/sr2k.h index 088ea23d94c..83dbf4941ff 100644 --- a/src/m/sr2k.h +++ b/src/m/sr2k.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/stride.h b/src/m/stride.h index 941b9d7cc98..f176a7642a7 100644 --- a/src/m/stride.h +++ b/src/m/stride.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/sun1.h b/src/m/sun1.h index 54d51106e6b..7ab81218705 100644 --- a/src/m/sun1.h +++ b/src/m/sun1.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/sun2.h b/src/m/sun2.h index 33f811aea04..452fdfc7c01 100644 --- a/src/m/sun2.h +++ b/src/m/sun2.h @@ -17,8 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/sun386.h b/src/m/sun386.h index d3866e8f177..782e10925ef 100644 --- a/src/m/sun386.h +++ b/src/m/sun386.h @@ -18,8 +18,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of operating system this machine is likely to run. diff --git a/src/m/symmetry.h b/src/m/symmetry.h index ca584c9c6e1..262d6474757 100644 --- a/src/m/symmetry.h +++ b/src/m/symmetry.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* CHANGE: [Eric H. Herrin II; eric@ms.uky.edu - 15 Sept 1988] * Modified the sequent.h file for the Sequent Symmetry machine. diff --git a/src/m/tad68k.h b/src/m/tad68k.h index 084e432223e..4c904aaf569 100644 --- a/src/m/tad68k.h +++ b/src/m/tad68k.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/tahoe.h b/src/m/tahoe.h index 42741e25cb6..988624839b4 100644 --- a/src/m/tahoe.h +++ b/src/m/tahoe.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/targon31.h b/src/m/targon31.h index afc72f4e0ee..08ecb681bd9 100644 --- a/src/m/targon31.h +++ b/src/m/targon31.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/tek4300.h b/src/m/tek4300.h index 34b160ba6da..164df72210a 100644 --- a/src/m/tek4300.h +++ b/src/m/tek4300.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h index a30bbdd8d6c..7af3dab6a07 100644 --- a/src/m/tekxd88.h +++ b/src/m/tekxd88.h @@ -17,8 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word diff --git a/src/m/template.h b/src/m/template.h index 914daa3047c..c088efff81a 100644 --- a/src/m/template.h +++ b/src/m/template.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/tower32.h b/src/m/tower32.h index 947e495aa20..c5f34d065ea 100644 --- a/src/m/tower32.h +++ b/src/m/tower32.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h index fbd7e032a38..927dfca93d9 100644 --- a/src/m/tower32v3.h +++ b/src/m/tower32v3.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ diff --git a/src/m/ustation.h b/src/m/ustation.h index b03a3555352..e7068f3cd86 100644 --- a/src/m/ustation.h +++ b/src/m/ustation.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/vax.h b/src/m/vax.h index 2e9d4738b64..22fda95abc5 100644 --- a/src/m/vax.h +++ b/src/m/vax.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/wicat.h b/src/m/wicat.h index bca10df352d..bd8fcefe99c 100644 --- a/src/m/wicat.h +++ b/src/m/wicat.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h index 701e6e21e1b..39c7baa9de6 100644 --- a/src/m/windowsnt.h +++ b/src/m/windowsnt.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of operating system this machine is likely to run. diff --git a/src/m/xps100.h b/src/m/xps100.h index 617b0a9c1d7..c6e54710bd6 100644 --- a/src/m/xps100.h +++ b/src/m/xps100.h @@ -17,8 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* The following line tells the configuration script what sort of diff --git a/src/mac.c b/src/mac.c index eaf4f029cf1..ef136ab6512 100644 --- a/src/mac.c +++ b/src/mac.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Contributed by Andrew Choi (akochoi@mac.com). */ diff --git a/src/macfns.c b/src/macfns.c index f6ce7c42a67..603f0ec5313 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Contributed by Andrew Choi (akochoi@mac.com). */ diff --git a/src/macgui.h b/src/macgui.h index 939496aaeef..d9948278d1b 100644 --- a/src/macgui.h +++ b/src/macgui.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Contributed by Andrew Choi (akochoi@mac.com). */ diff --git a/src/macmenu.c b/src/macmenu.c index ee83a5f609f..ab266f6f0b5 100644 --- a/src/macmenu.c +++ b/src/macmenu.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Contributed by Andrew Choi (akochoi@mac.com). */ diff --git a/src/macros.c b/src/macros.c index 8b17c9fb261..6f854018d6a 100644 --- a/src/macros.c +++ b/src/macros.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/macros.h b/src/macros.h index bf33ea8325b..d9b99b9984e 100644 --- a/src/macros.h +++ b/src/macros.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Kbd macro currently being executed (a string or vector). */ diff --git a/src/macselect.c b/src/macselect.c index 890bb62d1d4..b519950eb75 100644 --- a/src/macselect.c +++ b/src/macselect.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/macterm.c b/src/macterm.c index 16d8452c87c..53028f973f2 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Contributed by Andrew Choi (akochoi@mac.com). */ @@ -1336,6 +1336,12 @@ mac_draw_vertical_window_border (w, x, y0, y1) int x, y0, y1; { struct frame *f = XFRAME (WINDOW_FRAME (w)); + struct face *face; + + face = FACE_FROM_ID (f, VERTICAL_BORDER_FACE_ID); + if (face) + XSetForeground (FRAME_MAC_DISPLAY (f), f->output_data.mac->normal_gc, + face->foreground); XDrawLine (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f), f->output_data.mac->normal_gc, x, y0, x, y1); @@ -1724,6 +1730,7 @@ mac_encode_char (c, char2b, font_info, charset, two_byte_p) /* It's a program. */ struct ccl_program *ccl = font_info->font_encoder; + check_ccl_update (ccl); if (CHARSET_DIMENSION (charset) == 1) { ccl->reg[0] = CHARSET_ID (charset); @@ -6270,10 +6277,11 @@ mac_to_x_fontname (name, size, style, charset) Style style; char *charset; { - char foundry[32], family[32], cs[32]; + Str31 foundry, cs; + Str255 family; char xf[256], *result, *p; - if (sscanf (name, "%31[^-]-%31[^-]-%31s", foundry, family, cs) == 3) + if (sscanf (name, "%31[^-]-%255[^-]-%31s", foundry, family, cs) == 3) charset = cs; else { @@ -6281,13 +6289,12 @@ mac_to_x_fontname (name, size, style, charset) strcpy(family, name); } - sprintf(xf, "-%s-%s-%s-%c-normal--%d-%d-%d-%d-m-%d-%s", - foundry, family, style & bold ? "bold" : "medium", - style & italic ? 'i' : 'r', size, size * 10, - size ? 75 : 0, size ? 75 : 0, size * 10, charset); + sprintf (xf, "%s-%c-normal--%d-%d-%d-%d-m-%d-%s", + style & bold ? "bold" : "medium", style & italic ? 'i' : 'r', + size, size * 10, size ? 75 : 0, size ? 75 : 0, size * 10, charset); - result = (char *) xmalloc (strlen (xf) + 1); - strcpy (result, xf); + result = xmalloc (strlen (foundry) + strlen (family) + strlen (xf) + 3 + 1); + sprintf (result, "-%s-%s-%s", foundry, family, xf); for (p = result; *p; p++) *p = tolower(*p); return result; @@ -6307,15 +6314,17 @@ x_font_name_to_mac_font_name (xf, mf, mf_decoded, style, cs) Style *style; char *cs; { - char foundry[32], family[32], weight[20], slant[2], *p; + Str31 foundry; + Str255 family; + char weight[20], slant[2], *p; Lisp_Object charset_info, coding_system = Qnil; struct coding_system coding; strcpy (mf, ""); - if (sscanf (xf, "-%31[^-]-%31[^-]-%19[^-]-%1[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]-%31s", + if (sscanf (xf, "-%31[^-]-%255[^-]-%19[^-]-%1[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]-%31s", foundry, family, weight, slant, cs) != 5 && - sscanf (xf, "-%31[^-]-%31[^-]-%19[^-]-%1[^-]-%*[^-]--%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]-%31s", + sscanf (xf, "-%31[^-]-%255[^-]-%19[^-]-%1[^-]-%*[^-]--%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]-%31s", foundry, family, weight, slant, cs) != 5) return; @@ -6350,7 +6359,7 @@ x_font_name_to_mac_font_name (xf, mf, mf_decoded, style, cs) coding.dst_multibyte = 1; coding.mode |= CODING_MODE_LAST_BLOCK; encode_coding (&coding, mf_decoded, mf, - strlen (mf_decoded), sizeof (Str32) - 1); + strlen (mf_decoded), sizeof (Str255) - 1); mf[coding.produced] = '\0'; } #endif @@ -6483,7 +6492,7 @@ init_font_name_table () Handle font_handle, font_handle_2; short id, scriptcode; ResType type; - Str32 name; + Str255 name; struct FontAssoc *fat; struct AsscEntry *assc_entry; Lisp_Object text_encoding_info_alist, text_encoding_info; @@ -6622,8 +6631,7 @@ mac_do_list_fonts (pattern, maxnames) int i, n_fonts = 0; Lisp_Object font_list = Qnil, pattern_regex, fontname; char *regex = (char *) alloca (strlen (pattern) * 2 + 3); - char scaled[256]; - char *ptr; + char *scaled, *ptr; int scl_val[XLFD_SCL_LAST], *field, *val; char *longest_start, *cur_start, *nonspecial; int longest_len, exact; @@ -6747,6 +6755,7 @@ mac_do_list_fonts (pattern, maxnames) { int former_len = ptr - font_name_table[i]; + scaled = xmalloc (strlen (font_name_table[i]) + 20 + 1); memcpy (scaled, font_name_table[i], former_len); sprintf (scaled + former_len, "-%d-%d-75-75-m-%d-%s", @@ -6756,6 +6765,7 @@ mac_do_list_fonts (pattern, maxnames) ptr + sizeof ("-0-0-0-0-m-0-") - 1); fontname = mac_c_string_match (pattern_regex, scaled, nonspecial, exact); + xfree (scaled); if (!NILP (fontname)) { font_list = Fcons (fontname, font_list); @@ -6876,7 +6886,7 @@ x_font_min_bounds (font, w, h) the values computed. Value is non-zero if smallest_font_height or smallest_char_width become smaller than they were before. */ -int +static int x_compute_min_glyph_bounds (f) struct frame *f; { @@ -6961,7 +6971,8 @@ XLoadQueryFont (Display *dpy, char *fontname) GrafPtr port; SInt16 old_fontnum, old_fontsize; Style old_fontface; - Str32 mfontname, mfontname_decoded, charset; + Str255 mfontname, mfontname_decoded; + Str31 charset; SInt16 fontnum; Style fontface; #if TARGET_API_MAC_CARBON @@ -7355,7 +7366,7 @@ x_load_font (f, fontname, size) before, or if the font loaded has a smalle>r height than any other font loaded before. If this happens, it will make a glyph matrix reallocation necessary. */ - fonts_changed_p = x_compute_min_glyph_bounds (f); + fonts_changed_p |= x_compute_min_glyph_bounds (f); UNBLOCK_INPUT; return fontp; } diff --git a/src/macterm.h b/src/macterm.h index 55a5593077c..f0846b10fa4 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Contributed by Andrew Choi (akochoi@mac.com). */ diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 0ab23c72f78..1418dd64cfd 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -15,8 +15,8 @@ # # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. # ALL = emacs diff --git a/src/marker.c b/src/marker.c index 691bf6177c4..4184e9af2b3 100644 --- a/src/marker.c +++ b/src/marker.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/md5.c b/src/md5.c index c8df5616fa9..039213fd76b 100644 --- a/src/md5.c +++ b/src/md5.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */ diff --git a/src/md5.h b/src/md5.h index e1cb3dd2e5e..229da8daa8d 100644 --- a/src/md5.h +++ b/src/md5.h @@ -15,8 +15,8 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ #ifndef _MD5_H #define _MD5_H 1 diff --git a/src/mem-limits.h b/src/mem-limits.h index 57a79863a1b..aac8a396172 100644 --- a/src/mem-limits.h +++ b/src/mem-limits.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifdef MSDOS #include <dpmi.h> diff --git a/src/minibuf.c b/src/minibuf.c index 538fd0b8dac..cb843375e82 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/mktime.c b/src/mktime.c index cd8f0254030..c61f1463564 100644 --- a/src/mktime.c +++ b/src/mktime.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Define this to have a standalone program to test this implementation of diff --git a/src/msdos.c b/src/msdos.c index c987244148f..3105410af09 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Contributed by Morten Welinder */ /* New display, keyboard, and mouse control by Kim F. Storm */ diff --git a/src/msdos.h b/src/msdos.h index a07979d2f6a..7f2f013fd13 100644 --- a/src/msdos.h +++ b/src/msdos.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef EMACS_MSDOS_H #define EMACS_MSDOS_H diff --git a/src/prefix-args.c b/src/prefix-args.c index eeeb1038a47..5cfe6e4a095 100644 --- a/src/prefix-args.c +++ b/src/prefix-args.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Jim Blandy <jimb@occs.cs.oberlin.edu> - September 1992 diff --git a/src/print.c b/src/print.c index 145287707eb..0869340c400 100644 --- a/src/print.c +++ b/src/print.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/process.c b/src/process.c index bfa803e6907..1890a2a0893 100644 --- a/src/process.c +++ b/src/process.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/process.h b/src/process.h index 8e3f9028c0b..a58b08a197e 100644 --- a/src/process.h +++ b/src/process.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* This structure records information about a subprocess diff --git a/src/puresize.h b/src/puresize.h index 054b2bc4c89..5e51ae3b1ba 100644 --- a/src/puresize.h +++ b/src/puresize.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Define PURESIZE, the number of bytes of pure Lisp code to leave space for. diff --git a/src/ralloc.c b/src/ralloc.c index fd0d62e1977..824fb536fc1 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* NOTES: diff --git a/src/regex.c b/src/regex.c index e43fc2dc0aa..afd5cf1322c 100644 --- a/src/regex.c +++ b/src/regex.c @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* TODO: diff --git a/src/regex.h b/src/regex.h index b1cfd5fdd11..c8b0adaf73c 100644 --- a/src/regex.h +++ b/src/regex.h @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _REGEX_H diff --git a/src/region-cache.c b/src/region-cache.c index 251382a5a0e..22eac35ca86 100644 --- a/src/region-cache.c +++ b/src/region-cache.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/region-cache.h b/src/region-cache.h index 9c104b51a1b..5c27d00740f 100644 --- a/src/region-cache.h +++ b/src/region-cache.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* This code was written by Jim Blandy <jimb@cs.oberlin.edu> to help diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h index b96bf4373b3..8fe7bd8fa24 100644 --- a/src/s/aix3-1.h +++ b/src/s/aix3-1.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h index 624f7090f80..7316841e212 100644 --- a/src/s/bsd4-1.h +++ b/src/s/bsd4-1.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h index e39a8c81948..386ab1bbbe5 100644 --- a/src/s/bsd4-2.h +++ b/src/s/bsd4-2.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/bsd4-3.h b/src/s/bsd4-3.h index f5db6fbb5cd..bbb2715bdf7 100644 --- a/src/s/bsd4-3.h +++ b/src/s/bsd4-3.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/cxux.h b/src/s/cxux.h index fd8b00ff2b4..2af6d006095 100644 --- a/src/s/cxux.h +++ b/src/s/cxux.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/cygwin.h b/src/s/cygwin.h index 38e346ac510..0094ef793dc 100644 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h @@ -17,8 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* SYSTEM_TYPE should indicate the kind of system you are using. It sets the Lisp variable system-type. */ diff --git a/src/s/darwin.h b/src/s/darwin.h index 970e954b616..fea5b4c282d 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/dgux.h b/src/s/dgux.h index 4c4a84d9996..fb01b539f27 100644 --- a/src/s/dgux.h +++ b/src/s/dgux.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* * Define symbols to identify the version of Unix this is. diff --git a/src/s/dgux4.h b/src/s/dgux4.h index 7a1eaf42105..d866d63e6ce 100644 --- a/src/s/dgux4.h +++ b/src/s/dgux4.h @@ -16,7 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* This file was written by Roderick Schertler <roderick@ibcinc.com>, contact me if you have problems with or comments about running Emacs diff --git a/src/s/dgux5-4-3.h b/src/s/dgux5-4-3.h index 3d4c4775c91..a95420595a1 100644 --- a/src/s/dgux5-4-3.h +++ b/src/s/dgux5-4-3.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* NOTE: DGUX5.4R3.00 will not build with the delivered gcc-2.4.5 compiler. You must upgraded to at least gcc-2.5.8. If you are diff --git a/src/s/dgux5-4r2.h b/src/s/dgux5-4r2.h index 7121f5e18a3..c2c7461a204 100644 --- a/src/s/dgux5-4r2.h +++ b/src/s/dgux5-4r2.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include "dgux.h" diff --git a/src/s/freebsd.h b/src/s/freebsd.h index dbd08f5b3be..dc26eb9f399 100644 --- a/src/s/freebsd.h +++ b/src/s/freebsd.h @@ -18,8 +18,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Get the correct __FreeBSD_version, even if this is before that was defined. */ diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 3cf21756d7d..2563496af5c 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* This file was put together by Michael K. Johnson and Rik Faith. */ diff --git a/src/s/gnu.h b/src/s/gnu.h index f7fb4899db9..79e5a88a7b9 100644 --- a/src/s/gnu.h +++ b/src/s/gnu.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Get most of the stuff from bsd4.3 */ diff --git a/src/s/hpux.h b/src/s/hpux.h index debf6aad6d3..665b1f3063d 100644 --- a/src/s/hpux.h +++ b/src/s/hpux.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h index 51391d56e9d..8815bb56f39 100644 --- a/src/s/iris3-5.h +++ b/src/s/iris3-5.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h index 50d0962e48f..64187428c29 100644 --- a/src/s/iris3-6.h +++ b/src/s/iris3-6.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h index fad50aa20f8..60dd6d49c79 100644 --- a/src/s/irix3-3.h +++ b/src/s/irix3-3.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/lynxos.h b/src/s/lynxos.h index 017e1892c10..55de8cba6f9 100644 --- a/src/s/lynxos.h +++ b/src/s/lynxos.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* LynxOS is almost a bsd 4.2 system */ #include "s/bsd4-2.h" diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index 10e3bfe3a5a..c4697db34db 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* * Define symbols to identify the version of Unix this is. diff --git a/src/s/msdos.h b/src/s/msdos.h index cef2184a37b..5a0cbba5959 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Note: lots of stuff here was taken from s-msdos.h in demacs. */ diff --git a/src/s/newsos5.h b/src/s/newsos5.h index f4ab0597eee..c674bfc559d 100644 --- a/src/s/newsos5.h +++ b/src/s/newsos5.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Use the SysVr4 file for at least base configuration. */ diff --git a/src/s/nextstep.h b/src/s/nextstep.h index 36549e88bfa..9253e6acffc 100644 --- a/src/s/nextstep.h +++ b/src/s/nextstep.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include "bsd4-3.h" diff --git a/src/s/ptx.h b/src/s/ptx.h index dab0f0f205f..e490ba659a2 100644 --- a/src/s/ptx.h +++ b/src/s/ptx.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* This file was written by Bill Burton <billb@progress.com>. Parts were adapted from m-ptx1-2.h and process.c as distributed with the Emacs 18.57 diff --git a/src/s/riscix1-1.h b/src/s/riscix1-1.h index 15092f59add..ccfa5704b85 100644 --- a/src/s/riscix1-1.h +++ b/src/s/riscix1-1.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #define RISCiX_1_1 1 diff --git a/src/s/riscix12.h b/src/s/riscix12.h index 988fbd61ba0..b0e00e780cc 100644 --- a/src/s/riscix12.h +++ b/src/s/riscix12.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #define RISCiX_1_2 1 diff --git a/src/s/rtu.h b/src/s/rtu.h index afe63b5efcc..92afbaf6328 100644 --- a/src/s/rtu.h +++ b/src/s/rtu.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/sco4.h b/src/s/sco4.h index b39c7a75459..757eb0b57b0 100644 --- a/src/s/sco4.h +++ b/src/s/sco4.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Contributed by Ian Lance Taylor, ian@cygnus.com. */ diff --git a/src/s/sco5.h b/src/s/sco5.h index 096944b833d..e490a91b608 100644 --- a/src/s/sco5.h +++ b/src/s/sco5.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Contributed by Mark Diekhans <markd@grizzly.com>. */ diff --git a/src/s/template.h b/src/s/template.h index e969c72e0aa..5ef1049164d 100644 --- a/src/s/template.h +++ b/src/s/template.h @@ -17,8 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/umax.h b/src/s/umax.h index 36f5499a4b3..1741b1d04e3 100644 --- a/src/s/umax.h +++ b/src/s/umax.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h index 0a395b22a09..05d162239a8 100644 --- a/src/s/unipl5-2.h +++ b/src/s/unipl5-2.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h index ecce9d92c76..21b469dcd55 100644 --- a/src/s/usg5-0.h +++ b/src/s/usg5-0.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h index a360fd64d7a..dff90efb225 100644 --- a/src/s/usg5-2-2.h +++ b/src/s/usg5-2-2.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h index 375dba75f56..0da477276fd 100644 --- a/src/s/usg5-2.h +++ b/src/s/usg5-2.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h index de1a20d2658..285bae670df 100644 --- a/src/s/usg5-3.h +++ b/src/s/usg5-3.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h index 719b8c389a3..4edda95b39c 100644 --- a/src/s/usg5-4.h +++ b/src/s/usg5-4.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* This file written by James Van Artsdalen of Dell Computer Corporation. * james@bigtex.cactus.org. Subsequently improved for Dell 2.2 by Eric diff --git a/src/s/vms.h b/src/s/vms.h index 1338cdb5718..9afd69b8539 100644 --- a/src/s/vms.h +++ b/src/s/vms.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* * Define symbols to identify the version of Unix this is. diff --git a/src/s/xenix.h b/src/s/xenix.h index c0840bcd3b3..763a10956ff 100644 --- a/src/s/xenix.h +++ b/src/s/xenix.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* * Define symbols to identify the version of Unix this is. diff --git a/src/scroll.c b/src/scroll.c index 6c6aa4abf98..48a50e59983 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/search.c b/src/search.c index c15d09a5f7a..387abacc161 100644 --- a/src/search.c +++ b/src/search.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/sheap.c b/src/sheap.c index 714eb9a710d..b7f01d448a8 100644 --- a/src/sheap.c +++ b/src/sheap.c @@ -18,8 +18,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include <stdio.h> diff --git a/src/sound.c b/src/sound.c index 134b69dc81c..93e456cbc48 100644 --- a/src/sound.c +++ b/src/sound.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Written by Gerd Moellmann <gerd@gnu.org>. Tested with Luigi's driver on FreeBSD 2.2.7 with a SoundBlaster 16. */ diff --git a/src/strftime.c b/src/strftime.c index 4d3a9d1d312..41566ec868e 100644 --- a/src/strftime.c +++ b/src/strftime.c @@ -18,8 +18,8 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H # include <config.h> diff --git a/src/sunfns.c b/src/sunfns.c index 13fdfd3a1b7..6a16e6cc08f 100644 --- a/src/sunfns.c +++ b/src/sunfns.c @@ -25,8 +25,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Author: Jeff Peck, Sun Microsystems, Inc. <peck@sun.com> Original ideas by David Kastan and Eric Negaard, SRI International diff --git a/src/syntax.c b/src/syntax.c index bacb5ca2858..0ceab9d6af8 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/syntax.h b/src/syntax.h index ba862655cfe..34727af4740 100644 --- a/src/syntax.h +++ b/src/syntax.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ extern Lisp_Object Qsyntax_table_p; diff --git a/src/sysdep.c b/src/sysdep.c index 42179d97e82..8e8d02b844e 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/src/sysselect.h b/src/sysselect.h index 866a65e9208..0030e737bc2 100644 --- a/src/sysselect.h +++ b/src/sysselect.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifdef HAVE_SYS_SELECT_H #if defined (DARWIN) || defined (MAC_OSX) diff --git a/src/syssignal.h b/src/syssignal.h index 04e84df1a3a..dd13e3764aa 100644 --- a/src/syssignal.h +++ b/src/syssignal.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ extern void init_signals P_ ((void)); diff --git a/src/systime.h b/src/systime.h index 778e555c979..cf2bc0b084b 100644 --- a/src/systime.h +++ b/src/systime.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef EMACS_SYSTIME_H #define EMACS_SYSTIME_H diff --git a/src/systty.h b/src/systty.h index a975bcd13a0..b322ca60087 100644 --- a/src/systty.h +++ b/src/systty.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifdef HAVE_TERMIOS #define HAVE_TCATTR diff --git a/src/syswait.h b/src/syswait.h index 066f4e5a482..78057e3fed4 100644 --- a/src/syswait.h +++ b/src/syswait.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Define the structure that the wait system call stores. On many systems, there is a structure defined for this. diff --git a/src/term.c b/src/term.c index 62ad55a0c3e..c8c34ffee39 100644 --- a/src/term.c +++ b/src/term.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* New redisplay, TTY faces by Gerd Moellmann <gerd@gnu.org>. */ @@ -2023,14 +2023,20 @@ turn_on_face (f, face_id) if (fg >= 0 && TS_set_foreground) { - p = tparam (TS_set_foreground, NULL, 0, (int) fg); + if (standout_mode) + p = tparam (TS_set_background, NULL, 0, (int) fg); + else + p = tparam (TS_set_foreground, NULL, 0, (int) fg); OUTPUT (p); xfree (p); } if (bg >= 0 && TS_set_background) { - p = tparam (TS_set_background, NULL, 0, (int) bg); + if (standout_mode) + p = tparam (TS_set_foreground, NULL, 0, (int) bg); + else + p = tparam (TS_set_background, NULL, 0, (int) bg); OUTPUT (p); xfree (p); } diff --git a/src/termcap.c b/src/termcap.c index aa30aaa0615..5f2fa55556a 100644 --- a/src/termcap.c +++ b/src/termcap.c @@ -14,8 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Emacs config.h may rename various library functions such as malloc. */ #ifdef HAVE_CONFIG_H diff --git a/src/termchar.h b/src/termchar.h index b1d941adc27..3a3c9978dd6 100644 --- a/src/termchar.h +++ b/src/termchar.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* extern EMACS_INT baud_rate; */ /* Output speed in baud */ diff --git a/src/termhooks.h b/src/termhooks.h index 3e39e644173..395e179ff49 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Miscellanea. */ diff --git a/src/terminfo.c b/src/terminfo.c index 52acc5bdb4e..8f040d10c68 100644 --- a/src/terminfo.c +++ b/src/terminfo.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include "lisp.h" diff --git a/src/termopts.h b/src/termopts.h index 2dc798ea2c4..9d241f64678 100644 --- a/src/termopts.h +++ b/src/termopts.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Nonzero means flash the screen instead of ringing the bell. */ diff --git a/src/textprop.c b/src/textprop.c index e6dd411dcc5..718051e38f2 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include "lisp.h" diff --git a/src/tparam.c b/src/tparam.c index ea208692161..e05f01f4911 100644 --- a/src/tparam.c +++ b/src/tparam.c @@ -13,8 +13,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Emacs config.h may rename various library functions such as malloc. */ #ifdef HAVE_CONFIG_H diff --git a/src/uaf.h b/src/uaf.h index ae364b5f5ef..71ae7267147 100644 --- a/src/uaf.h +++ b/src/uaf.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* * User Authorization File record formats diff --git a/src/undo.c b/src/undo.c index b4e16bfd0e5..13ee40130a9 100644 --- a/src/undo.c +++ b/src/undo.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/unexaix.c b/src/unexaix.c index 825209a5b3c..4c9f2727e88 100644 --- a/src/unexaix.c +++ b/src/unexaix.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. In other words, you are welcome to use, share and improve this program. You are forbidden to forbid anyone else to use, share and improve diff --git a/src/unexalpha.c b/src/unexalpha.c index 97f8f383dda..aa32f411fcb 100644 --- a/src/unexalpha.c +++ b/src/unexalpha.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/unexapollo.c b/src/unexapollo.c index adf72bb4f7a..d9bff963695 100644 --- a/src/unexapollo.c +++ b/src/unexapollo.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Written by Leonard N. Zubkoff. */ diff --git a/src/unexconvex.c b/src/unexconvex.c index 10c0dfa953c..cbd1dd29fda 100644 --- a/src/unexconvex.c +++ b/src/unexconvex.c @@ -23,8 +23,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* modified for C-1 arch by jthomp@convex 871103 */ diff --git a/src/unexcw.c b/src/unexcw.c index 046c8f796ef..77d5866136b 100644 --- a/src/unexcw.c +++ b/src/unexcw.c @@ -18,8 +18,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include <lisp.h> diff --git a/src/unexec.c b/src/unexec.c index 156cad16f97..bf231b00626 100644 --- a/src/unexec.c +++ b/src/unexec.c @@ -14,8 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* diff --git a/src/unexelf.c b/src/unexelf.c index ce773190d7e..9e8b827a754 100644 --- a/src/unexelf.c +++ b/src/unexelf.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. In other words, you are welcome to use, share and improve this program. You are forbidden to forbid anyone else to use, share and improve diff --git a/src/unexenix.c b/src/unexenix.c index a6d045d2e4f..94ac3eb821d 100644 --- a/src/unexenix.c +++ b/src/unexenix.c @@ -22,8 +22,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ diff --git a/src/unexmacosx.c b/src/unexmacosx.c index 1a2c211a09d..a191c0721e5 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Contributed by Andrew Choi (akochoi@mac.com). */ diff --git a/src/unexmips.c b/src/unexmips.c index de3368ad181..53b40f62742 100644 --- a/src/unexmips.c +++ b/src/unexmips.c @@ -22,8 +22,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/unexnext.c b/src/unexnext.c index 50a0448d7bc..2a0b66bc868 100644 --- a/src/unexnext.c +++ b/src/unexnext.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #undef __STRICT_BSD__ diff --git a/src/unexsni.c b/src/unexsni.c index a99d51bc0cf..0c67af899d5 100644 --- a/src/unexsni.c +++ b/src/unexsni.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. In other words, you are welcome to use, share and improve this program. You are forbidden to forbid anyone else to use, share and improve diff --git a/src/unexsunos4.c b/src/unexsunos4.c index 4534a32c322..9ad06b6adaf 100644 --- a/src/unexsunos4.c +++ b/src/unexsunos4.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Contributed by Viktor Dukhovni. */ /* diff --git a/src/unexw32.c b/src/unexw32.c index ebeb7355673..5380ca5c8f7 100644 --- a/src/unexw32.c +++ b/src/unexw32.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. Geoff Voelker (voelker@cs.washington.edu) 8-12-94 */ diff --git a/src/vm-limit.c b/src/vm-limit.c index 0dc89098afb..1840eb61c0c 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifdef emacs #include <config.h> diff --git a/src/w16select.c b/src/w16select.c index f765b5c55fc..1cbbebb1340 100644 --- a/src/w16select.c +++ b/src/w16select.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* These functions work by using WinOldAp interface. WinOldAp (WINOLDAP.MOD) is a Microsoft Windows extension supporting diff --git a/src/w32.c b/src/w32.c index 1585b3eaf1e..77959037913 100644 --- a/src/w32.c +++ b/src/w32.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. Geoff Voelker (voelker@cs.washington.edu) 7-29-94 */ diff --git a/src/w32.h b/src/w32.h index 79a78a5a544..622a2256f0f 100644 --- a/src/w32.h +++ b/src/w32.h @@ -18,8 +18,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* File descriptor set emulation. */ diff --git a/src/w32bdf.c b/src/w32bdf.c index 425669ee2a5..37fb6d85cdd 100644 --- a/src/w32bdf.c +++ b/src/w32bdf.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Based heavily on code by H. Miyashita for Meadow (a descendant of MULE for W32). */ diff --git a/src/w32bdf.h b/src/w32bdf.h index 23939bfd7d8..ca8a5f368cb 100644 --- a/src/w32bdf.h +++ b/src/w32bdf.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Based heavily on code by H. Miyashita for Meadow (a descendant of MULE for W32). */ diff --git a/src/w32console.c b/src/w32console.c index 858291bea38..b8ba169ae49 100644 --- a/src/w32console.c +++ b/src/w32console.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. Tim Fleehart (apollo@online.com) 1-17-92 Geoff Voelker (voelker@cs.washington.edu) 9-12-93 @@ -635,7 +635,24 @@ initialize_w32_display (void) meta_key = 1; char_attr_normal = info.wAttributes; - if (w32_use_full_screen_buffer) + /* Determine if the info returned by GetConsoleScreenBufferInfo + is realistic. Old MS Telnet servers used to only fill out + the dwSize portion, even modern one fill the whole struct with + garbage when using non-MS telnet clients. */ + if ((w32_use_full_screen_buffer + && (info.dwSize.Y < 20 || info.dwSize.Y > 100 + || info.dwSize.X < 40 || info.dwSize.X > 200)) + || (!w32_use_full_screen_buffer + && (info.srWindow.Bottom - info.srWindow.Top < 20 + || info.srWindow.Bottom - info.srWindow.Top > 100 + || info.srWindow.Right - info.srWindow.Left < 40 + || info.srWindow.Right - info.srWindow.Left > 100))) + { + FRAME_LINES (SELECTED_FRAME ()) = 25; + SET_FRAME_COLS (SELECTED_FRAME (), 80); + } + + else if (w32_use_full_screen_buffer) { FRAME_LINES (SELECTED_FRAME ()) = info.dwSize.Y; /* lines per page */ SET_FRAME_COLS (SELECTED_FRAME (), info.dwSize.X); /* characters per line */ @@ -691,7 +708,7 @@ This is desirable when running Emacs over telnet, and is the default. A value of nil means use the current console window dimensions; this may be preferrable when working directly at the console with a large scroll-back buffer. */); - w32_use_full_screen_buffer = 1; + w32_use_full_screen_buffer = 0; defsubr (&Sset_screen_color); defsubr (&Sset_cursor_size); diff --git a/src/w32fns.c b/src/w32fns.c index 5d92cb03d00..236aa81d7a8 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Added by Kevin Gallo */ diff --git a/src/w32gui.h b/src/w32gui.h index 04182c6da80..1fd145cd026 100644 --- a/src/w32gui.h +++ b/src/w32gui.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef EMACS_W32GUI_H #define EMACS_W32GUI_H diff --git a/src/w32heap.c b/src/w32heap.c index 4c28718a510..7de08bb2b4e 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. Geoff Voelker (voelker@cs.washington.edu) 7-29-94 */ diff --git a/src/w32heap.h b/src/w32heap.h index 556c7fb28b4..259d0bf9ede 100644 --- a/src/w32heap.h +++ b/src/w32heap.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. Geoff Voelker (voelker@cs.washington.edu) 7-29-94 */ diff --git a/src/w32inevt.c b/src/w32inevt.c index 8dd4f406881..cc7c5e1e612 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. Drew Bliss 01-Oct-93 Adapted from ntkbd.c by Tim Fleehart diff --git a/src/w32inevt.h b/src/w32inevt.h index fb61cb0ef55..f811c96c313 100644 --- a/src/w32inevt.h +++ b/src/w32inevt.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef EMACS_W32INEVT_H #define EMACS_W32INEVT_H diff --git a/src/w32menu.c b/src/w32menu.c index c5af0aae980..065355f8755 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include <signal.h> diff --git a/src/w32proc.c b/src/w32proc.c index 48b5e2c14a3..0e3f8f2fd47 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. Drew Bliss Oct 14, 1993 Adapted from alarm.c by Tim Fleehart diff --git a/src/w32reg.c b/src/w32reg.c index 97abbed5d2e..a70835ac303 100644 --- a/src/w32reg.c +++ b/src/w32reg.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Written by Kevin Gallo */ diff --git a/src/w32select.c b/src/w32select.c index 19648a22429..03bddb51dfc 100644 --- a/src/w32select.c +++ b/src/w32select.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Written by Kevin Gallo, Benjamin Riefenstahl */ diff --git a/src/w32term.c b/src/w32term.c index 0bb5607512c..543b5883bc2 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include <signal.h> @@ -165,6 +165,9 @@ int w32_use_visible_system_caret; for Far East languages. */ int w32_enable_unicode_output; +/* Flag to enable Cleartype hack for font metrics. */ +static int cleartype_active; + DWORD dwWindowsThreadId = 0; HANDLE hWindowsThread = NULL; DWORD dwMainThreadId = 0; @@ -534,6 +537,7 @@ w32_draw_vertical_window_border (w, x, y0, y1) struct frame *f = XFRAME (WINDOW_FRAME (w)); RECT r; HDC hdc; + struct face *face; r.left = x; r.right = x + 1; @@ -541,7 +545,12 @@ w32_draw_vertical_window_border (w, x, y0, y1) r.bottom = y1; hdc = get_frame_dc (f); - w32_fill_rect (f, hdc, FRAME_FOREGROUND_PIXEL (f), &r); + face = FACE_FROM_ID (f, VERTICAL_BORDER_FACE_ID); + if (face) + w32_fill_rect (f, hdc, face->foreground, &r); + else + w32_fill_rect (f, hdc, FRAME_FOREGROUND_PIXEL (f), &r); + release_frame_dc (f, hdc); } @@ -935,6 +944,16 @@ w32_native_per_char_metric (font, char2b, font_type, pcm) int real_width; GetCharWidth (hdc, *char2b, *char2b, &real_width); #endif + if (cleartype_active) + { + /* Cleartype antialiasing causes characters to overhang + by a pixel on each side compared with what GetCharABCWidths + reports. */ + char_widths.abcA -= 1; + char_widths.abcC -= 1; + char_widths.abcB += 2; + } + pcm->width = char_widths.abcA + char_widths.abcB + char_widths.abcC; #if 0 /* As far as I can tell, this is the best way to determine what @@ -6571,6 +6590,12 @@ w32_initialize () w32_system_caret_x = 0; w32_system_caret_y = 0; + /* Initialize w32_use_visible_system_caret based on whether a screen + reader is in use. */ + if (!SystemParametersInfo (SPI_GETSCREENREADER, 0, + &w32_use_visible_system_caret, 0)) + w32_use_visible_system_caret = 0; + last_tool_bar_item = -1; any_help_event_p = 0; @@ -6616,6 +6641,8 @@ w32_initialize () { HANDLE user_lib = LoadLibrary ("user32.dll"); HANDLE gdi_lib = LoadLibrary ("gdi32.dll"); + UINT smoothing_type; + BOOL smoothing_enabled; #define LOAD_PROC(lib, fn) pfn##fn = (void *) GetProcAddress (lib, #fn) @@ -6638,6 +6665,28 @@ w32_initialize () effectively form the border of the main scroll bar range. */ vertical_scroll_bar_top_border = vertical_scroll_bar_bottom_border = GetSystemMetrics (SM_CYVSCROLL); + + /* Constants that are not always defined by the system headers + since they only exist on certain versions of Windows. */ +#ifndef SPI_GETFONTSMOOTHING +#define SPI_GETFONTSMOOTHING 0x4A +#endif +#ifndef SPI_GETFONTSMOOTHINGTYPE +#define SPI_GETFONTSMOOTHINGTYPE 0x0200A +#endif +#ifndef FE_FONTSMOOTHINGCLEARTYPE +#define FE_FONTSMOOTHINGCLEARTYPE 0x2 +#endif + + /* Determine if Cleartype is in use. Used to enable a hack in + the char metric calculations which adds extra pixels to + compensate for the "sub-pixels" that are not counted by the + system APIs. */ + cleartype_active = + SystemParametersInfo (SPI_GETFONTSMOOTHING, 0, &smoothing_enabled, 0) + && smoothing_enabled + && SystemParametersInfo (SPI_GETFONTSMOOTHINGTYPE, 0, &smoothing_type, 0) + && smoothing_type == FE_FONTSMOOTHINGCLEARTYPE; } } @@ -6707,11 +6756,7 @@ software is running as it starts up. When this variable is set, other variables affecting the appearance of the cursor have no effect. */); - /* Initialize w32_use_visible_system_caret based on whether a screen - reader is in use. */ - if (!SystemParametersInfo (SPI_GETSCREENREADER, 0, - &w32_use_visible_system_caret, 0)) - w32_use_visible_system_caret = 0; + w32_use_visible_system_caret = 0; /* We don't yet support this, but defining this here avoids whining from cus-start.el and other places, like "M-x set-variable". */ diff --git a/src/w32term.h b/src/w32term.h index 61c7c5b6115..8703f017c5a 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Added by Kevin Gallo */ diff --git a/src/w32xfns.c b/src/w32xfns.c index 9f9a64558f6..ba705d9498d 100644 --- a/src/w32xfns.c +++ b/src/w32xfns.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include <signal.h> diff --git a/src/widget.c b/src/widget.c index 57eef4059e6..fdd927cb175 100644 --- a/src/widget.c +++ b/src/widget.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Emacs 19 face widget ported by Fred Pierresteguy */ diff --git a/src/widget.h b/src/widget.h index c5d4f597ea3..174a6a720de 100644 --- a/src/widget.h +++ b/src/widget.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Emacs 19 face widget ported by Fred Pierresteguy */ diff --git a/src/widgetprv.h b/src/widgetprv.h index b75ef769029..ce087e825cb 100644 --- a/src/widgetprv.h +++ b/src/widgetprv.h @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Emacs 19 face widget ported by Fred Pierresteguy */ diff --git a/src/window.c b/src/window.c index fd40cf593ee..941c0a00133 100644 --- a/src/window.c +++ b/src/window.c @@ -17,8 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include "lisp.h" @@ -4783,7 +4783,9 @@ window_scroll_pixel_based (window, n, whole, noerror) /* We moved the window start towards ZV, so PT may be now in the scroll margin at the top. */ move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); - if (IT_CHARPOS (it) == PT && it.current_y >= this_scroll_margin) + if (IT_CHARPOS (it) == PT && it.current_y >= this_scroll_margin + && (NILP (Vscroll_preserve_screen_position) + || EQ (Vscroll_preserve_screen_position, Qt))) /* We found PT at a legitimate height. Leave it alone. */ ; else if (preserve_y >= 0) @@ -4820,7 +4822,9 @@ window_scroll_pixel_based (window, n, whole, noerror) /* We moved the window start towards BEGV, so PT may be now in the scroll margin at the bottom. */ move_it_to (&it, PT, -1, - it.last_visible_y - this_scroll_margin - 1, -1, + (it.last_visible_y - CURRENT_HEADER_LINE_HEIGHT (w) + - this_scroll_margin - 1), + -1, MOVE_TO_POS | MOVE_TO_Y); /* Save our position, in case it's correct. */ @@ -4836,7 +4840,9 @@ window_scroll_pixel_based (window, n, whole, noerror) partial_p = it.current_y > it.last_visible_y; } - if (charpos == PT && !partial_p) + if (charpos == PT && !partial_p + && (NILP (Vscroll_preserve_screen_position) + || EQ (Vscroll_preserve_screen_position, Qt))) /* We found PT before we found the display margin, so PT is ok. */ ; else if (preserve_y >= 0) @@ -4951,7 +4957,8 @@ window_scroll_line_based (window, n, whole, noerror) the window-scroll-functions. */ w->force_start = Qt; - if (whole && !NILP (Vscroll_preserve_screen_position)) + if (!NILP (Vscroll_preserve_screen_position) + && (whole || !EQ (Vscroll_preserve_screen_position, Qt))) { SET_PT_BOTH (pos, pos_byte); Fvertical_motion (make_number (original_vpos), window); @@ -5326,6 +5333,8 @@ and redisplay normally--don't erase and redraw the frame. */) struct buffer *obuf = current_buffer; int center_p = 0; int charpos, bytepos; + int iarg; + int this_scroll_margin; /* If redisplay is suppressed due to an error, try again. */ obuf->display_error_modiff = 0; @@ -5352,6 +5361,12 @@ and redisplay normally--don't erase and redraw the frame. */) set_buffer_internal (buf); + /* Do this after making BUF current + in case scroll_margin is buffer-local. */ + this_scroll_margin = max (0, scroll_margin); + this_scroll_margin = min (this_scroll_margin, + XFASTINT (w->total_lines) / 4); + /* Handle centering on a graphical frame specially. Such frames can have variable-height lines and centering point on the basis of line counts would lead to strange effects. */ @@ -5368,14 +5383,17 @@ and redisplay normally--don't erase and redraw the frame. */) charpos = IT_CHARPOS (it); bytepos = IT_BYTEPOS (it); } - else if (XINT (arg) < 0) + else if (iarg < 0) { struct it it; struct text_pos pt; - int nlines = - XINT (arg); + int nlines = -iarg; int extra_line_spacing; int h = window_box_height (w); + iarg = XINT (arg); + iarg = - max (-iarg, this_scroll_margin); + SET_TEXT_POS (pt, PT, PT_BYTE); start_display (&it, w, pt); @@ -5434,7 +5452,11 @@ and redisplay normally--don't erase and redraw the frame. */) else { struct position pos; - pos = *vmotion (PT, - XINT (arg), w); + + iarg = XINT (arg); + iarg = max (iarg, this_scroll_margin); + + pos = *vmotion (PT, -iarg, w); charpos = pos.bufpos; bytepos = pos.bytepos; } @@ -5445,11 +5467,17 @@ and redisplay normally--don't erase and redraw the frame. */) int ht = window_internal_height (w); if (center_p) - arg = make_number (ht / 2); + iarg = make_number (ht / 2); else if (XINT (arg) < 0) - arg = make_number (XINT (arg) + ht); + iarg = XINT (arg) + ht; + else + iarg = XINT (arg); + + /* Don't let it get into the margin at either top or bottom. */ + iarg = max (iarg, this_scroll_margin); + iarg = min (iarg, ht - this_scroll_margin - 1); - pos = *vmotion (PT, - XINT (arg), w); + pos = *vmotion (PT, - iarg, w); charpos = pos.bufpos; bytepos = pos.bytepos; } @@ -5498,6 +5526,9 @@ zero means top of window, negative means relative to bottom of window. */) struct window *w = XWINDOW (selected_window); int lines, start; Lisp_Object window; +#if 0 + int this_scroll_margin; +#endif window = selected_window; start = marker_position (w->start); @@ -5513,13 +5544,33 @@ zero means top of window, negative means relative to bottom of window. */) Fgoto_char (w->start); lines = displayed_window_lines (w); + +#if 0 + this_scroll_margin = max (0, scroll_margin); + this_scroll_margin = min (this_scroll_margin, lines / 4); +#endif + if (NILP (arg)) XSETFASTINT (arg, lines / 2); else { - arg = Fprefix_numeric_value (arg); - if (XINT (arg) < 0) - XSETINT (arg, XINT (arg) + lines); + int iarg = XINT (Fprefix_numeric_value (arg)); + + if (iarg < 0) + iarg = iarg + lines; + +#if 0 /* This code would prevent move-to-window-line from moving point + to a place inside the scroll margins (which would cause the + next redisplay to scroll). I wrote this code, but then concluded + it is probably better not to install it. However, it is here + inside #if 0 so as not to lose it. -- rms. */ + + /* Don't let it get into the margin at either top or bottom. */ + iarg = max (iarg, this_scroll_margin); + iarg = min (iarg, lines - this_scroll_margin - 1); +#endif + + arg = make_number (iarg); } /* Skip past a partially visible first line. */ @@ -6914,9 +6965,13 @@ If there is only one window, it is split regardless of this value. */); DEFVAR_LISP ("scroll-preserve-screen-position", &Vscroll_preserve_screen_position, - doc: /* *Non-nil means scroll commands move point to keep its screen line unchanged. -This is only when it is impossible to keep point fixed and still -scroll as specified. */); + doc: /* *Controls if scroll commands move point to keep its screen line unchanged. +A value of nil means point does not keep its screen position except +at the scroll margin or window boundary respectively. +A value of t means point keeps its screen position if the scroll +command moved it vertically out of the window, e.g. when scrolling +by full screens. +Any other value means point always keeps its screen position. */); Vscroll_preserve_screen_position = Qnil; DEFVAR_LISP ("window-configuration-change-hook", diff --git a/src/window.h b/src/window.h index d77e0a6f56f..99274e04ad1 100644 --- a/src/window.h +++ b/src/window.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef WINDOW_H_INCLUDED #define WINDOW_H_INCLUDED diff --git a/src/xdisp.c b/src/xdisp.c index 0a2a02b4628..122481a5ff0 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* New redisplay written by Gerd Moellmann <gerd@gnu.org>. @@ -12835,11 +12835,11 @@ try_window (window, pos, check_margins) if ((w->cursor.y < this_scroll_margin && CHARPOS (pos) > BEGV) - /* Old redisplay didn't take scroll margin into account at the bottom, - but then global-hl-line-mode doesn't scroll. KFS 2004-06-14 */ - || (w->cursor.y + (make_cursor_line_fully_visible_p - ? cursor_height + this_scroll_margin - : 1)) > it.last_visible_y) + /* rms: considering make_cursor_line_fully_visible_p here + seems to give wrong results. We don't want to recenter + when the last line is partly visible, we want to allow + that case to be handled in the usual way. */ + || (w->cursor.y + 1) > it.last_visible_y) { w->cursor.vpos = -1; clear_glyph_matrix (w->desired_matrix); @@ -22541,6 +22541,9 @@ x_draw_vertical_border (w) window_box_edges (w, -1, &x0, &y0, &x1, &y1); y1 -= 1; + if (WINDOW_LEFT_FRINGE_WIDTH (w) == 0) + x1 -= 1; + rif->draw_vertical_window_border (w, x1, y0, y1); } else if (!WINDOW_LEFTMOST_P (w) @@ -22551,6 +22554,9 @@ x_draw_vertical_border (w) window_box_edges (w, -1, &x0, &y0, &x1, &y1); y1 -= 1; + if (WINDOW_LEFT_FRINGE_WIDTH (w) == 0) + x0 -= 1; + rif->draw_vertical_window_border (w, x0, y0, y1); } } diff --git a/src/xfaces.c b/src/xfaces.c index 62e33c050de..165a86a45fc 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* New face implementation by Gerd Moellmann <gerd@gnu.org>. */ diff --git a/src/xfns.c b/src/xfns.c index 1de6fc71d1a..8826da7650b 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> #include <stdio.h> diff --git a/src/xmenu.c b/src/xmenu.c index a05c9793750..180edf871b5 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* X pop-up deck-of-cards menu facility for GNU Emacs. * diff --git a/src/xrdb.c b/src/xrdb.c index 957227b7942..248e5eba64d 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Written by jla, 4/90 */ diff --git a/src/xselect.c b/src/xselect.c index b0a2aee92ec..13bc241053f 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Rewritten by jwz */ diff --git a/src/xsmfns.c b/src/xsmfns.c index 5b53c0ca34d..9a94adbb997 100644 --- a/src/xsmfns.c +++ b/src/xsmfns.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <config.h> diff --git a/src/xterm.c b/src/xterm.c index 0a22930fb4f..308456965c1 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* New display code by Gerd Moellmann <gerd@gnu.org>. */ /* Xt features made by Fred Pierresteguy. */ @@ -536,6 +536,12 @@ x_draw_vertical_window_border (w, x, y0, y1) int x, y0, y1; { struct frame *f = XFRAME (WINDOW_FRAME (w)); + struct face *face; + + face = FACE_FROM_ID (f, VERTICAL_BORDER_FACE_ID); + if (face) + XSetForeground (FRAME_X_DISPLAY (f), f->output_data.x->normal_gc, + face->foreground); XDrawLine (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), f->output_data.x->normal_gc, x, y0, x, y1); @@ -6287,6 +6293,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) if (compose_status.chars_matched > 0 && nbytes == 0) break; + bzero (&compose_status, sizeof (compose_status)); orig_keysym = keysym; /* Common for all keysym input events. */ diff --git a/src/xterm.h b/src/xterm.h index cf2583981f0..337e51a673d 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include <X11/Xlib.h> #include <X11/cursorfont.h> |