Mercurial > hg > xemacs-beta

comparison src/emacs.c @ 5228:5efbd1253905

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove all support for InfoDock. src/ChangeLog addition: 2010-06-02 Aidan Kehoe <kehoea@parhasard.net> * lread.c (vars_of_lread): * emacs.c: (shut_down_emacs, vars_of_emacs, complex_vars_of_emacs): * device-x.c (get_device_from_display) (have_xemacs_resources_in_xrdb): * device-gtk.c (Fgtk_init): * config.h.in: Remove all checks for InfoDock. lisp/ChangeLog addition: 2010-06-02 Aidan Kehoe <kehoea@parhasard.net> * version.el: (emacs-version): * startup.el (command-line): * simple.el (display-warning, emacs-name): * packages.el (packages-package-hierarchy-directory-names): * loadup.el (Dumping): * dumped-lisp.el (preloaded-file-list): Remove all InfoDock-specific code.
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 07 Jun 2010 18:42:10 +0100
parents 4cd28c29a7a1
children ba07c880114a
comparison
equal deleted inserted replaced
5227:fbd1485af104 5228:5efbd1253905
510 Lisp_Object Vemacs_patch_level; 510 Lisp_Object Vemacs_patch_level;
511 Lisp_Object Vemacs_beta_version; 511 Lisp_Object Vemacs_beta_version;
512 Lisp_Object Vxemacs_codename; 512 Lisp_Object Vxemacs_codename;
513 Lisp_Object Vxemacs_extra_name; 513 Lisp_Object Vxemacs_extra_name;
514 Lisp_Object Vxemacs_release_date; 514 Lisp_Object Vxemacs_release_date;
515 #ifdef INFODOCK
516 Lisp_Object Vinfodock_major_version;
517 Lisp_Object Vinfodock_minor_version;
518 Lisp_Object Vinfodock_build_version;
519 #endif
520 515
521 /* The path under which XEmacs was invoked. */ 516 /* The path under which XEmacs was invoked. */
522 Lisp_Object Vinvocation_path; 517 Lisp_Object Vinvocation_path;
523 518
524 /* The name under which XEmacs was invoked, with any leading directory 519 /* The name under which XEmacs was invoked, with any leading directory
3634 "Use `M-x recover-session' to recover them.\n" 3629 "Use `M-x recover-session' to recover them.\n"
3635 "\n" 3630 "\n"
3636 "Your version of XEmacs was distributed with a PROBLEMS file that may describe\n" 3631 "Your version of XEmacs was distributed with a PROBLEMS file that may describe\n"
3637 "your crash, and with luck a workaround. Please check it first, but do report\n" 3632 "your crash, and with luck a workaround. Please check it first, but do report\n"
3638 "the crash anyway.\n\n" 3633 "the crash anyway.\n\n"
3639 #ifdef INFODOCK
3640 "Please report this bug by selecting `Report-Bug' in the InfoDock menu, or\n"
3641 "(last resort) by emailing `xemacs-beta@xemacs.org' -- note that this is for\n"
3642 "XEmacs in general, not just Infodock."
3643 #else
3644 "Please report this bug by invoking M-x report-emacs-bug, or by selecting\n" 3634 "Please report this bug by invoking M-x report-emacs-bug, or by selecting\n"
3645 "`Send Bug Report' from the Help menu. If that won't work, send ordinary\n" 3635 "`Send Bug Report' from the Help menu. If that won't work, send ordinary\n"
3646 "email to `xemacs-beta@xemacs.org'." 3636 "email to `xemacs-beta@xemacs.org'."
3647 #endif
3648 " *MAKE SURE* to include this entire\n" 3637 " *MAKE SURE* to include this entire\n"
3649 "output from this crash, especially including the Lisp backtrace, as well as\n" 3638 "output from this crash, especially including the Lisp backtrace, as well as\n"
3650 "the XEmacs configuration from M-x describe-installation (or equivalently,\n" 3639 "the XEmacs configuration from M-x describe-installation (or equivalently,\n"
3651 "the file `Installation' in the top of the build tree).\n" 3640 "the file `Installation' in the top of the build tree).\n"
3652 #ifdef _MSC_VER 3641 #ifdef _MSC_VER
4341 Vemacs_beta_version = make_int (EMACS_BETA_VERSION); 4330 Vemacs_beta_version = make_int (EMACS_BETA_VERSION);
4342 #else 4331 #else
4343 Vemacs_beta_version = Qnil; 4332 Vemacs_beta_version = Qnil;
4344 #endif 4333 #endif
4345 4334
4346 #ifdef INFODOCK
4347 DEFVAR_LISP ("infodock-major-version", &Vinfodock_major_version /*
4348 Major version number of this InfoDock release.
4349 */ );
4350 Vinfodock_major_version = make_int (INFODOCK_MAJOR_VERSION);
4351
4352 DEFVAR_LISP ("infodock-minor-version", &Vinfodock_minor_version /*
4353 Minor version number of this InfoDock release.
4354 */ );
4355 Vinfodock_minor_version = make_int (INFODOCK_MINOR_VERSION);
4356
4357 DEFVAR_LISP ("infodock-build-version", &Vinfodock_build_version /*
4358 Build version of this InfoDock release.
4359 */ );
4360 Vinfodock_build_version = make_int (INFODOCK_BUILD_VERSION);
4361 #endif
4362 4335
4363 DEFVAR_LISP ("xemacs-codename", &Vxemacs_codename /* 4336 DEFVAR_LISP ("xemacs-codename", &Vxemacs_codename /*
4364 Codename of this version of Emacs (a string). 4337 Codename of this version of Emacs (a string).
4365 */ ); 4338 */ );
4366 #ifndef XEMACS_CODENAME 4339 #ifndef XEMACS_CODENAME
4555 { 4528 {
4556 /* This is all related to path searching. */ 4529 /* This is all related to path searching. */
4557 4530
4558 DEFVAR_LISP ("emacs-program-name", &Vemacs_program_name /* 4531 DEFVAR_LISP ("emacs-program-name", &Vemacs_program_name /*
4559 *Name of the Emacs variant. 4532 *Name of the Emacs variant.
4560 For example, this may be \"xemacs\" or \"infodock\".
4561 This is mainly meant for use in path searching. 4533 This is mainly meant for use in path searching.
4562 */ ); 4534 */ );
4563 Vemacs_program_name = build_extstring (PATH_PROGNAME, Qfile_name); 4535 Vemacs_program_name = build_extstring (PATH_PROGNAME, Qfile_name);
4564 4536
4565 DEFVAR_LISP ("emacs-program-version", &Vemacs_program_version /* 4537 DEFVAR_LISP ("emacs-program-version", &Vemacs_program_version /*