Mercurial > hg > xemacs-beta

comparison lisp/simple.el @ 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 db2db229ee82
children 57a64ab2ae45 308d34e9f07d
comparison
equal deleted inserted replaced
5227:fbd1485af104 5228:5efbd1253905
4679 `display-warning-minimum-level', but above `log-warning-minimum-level' so 4679 `display-warning-minimum-level', but above `log-warning-minimum-level' so
4680 long as they're not listed in that variable as well." 4680 long as they're not listed in that variable as well."
4681 (or level (setq level 'warning)) 4681 (or level (setq level 'warning))
4682 (or (listp class) (setq class (list class))) 4682 (or (listp class) (setq class (list class)))
4683 (check-argument-type 'warning-level-p level) 4683 (check-argument-type 'warning-level-p level)
4684 (if (and (not (featurep 'infodock)) 4684 (if (not init-file-loaded)
4685 (not init-file-loaded))
4686 (push (list class message level) before-init-deferred-warnings) 4685 (push (list class message level) before-init-deferred-warnings)
4687 (catch 'ignored 4686 (catch 'ignored
4688 (let ((display-p t) 4687 (let ((display-p t)
4689 (level-num (cdr (assq level warning-level-alist)))) 4688 (level-num (cdr (assq level warning-level-alist))))
4690 (if (< level-num (cdr (assq log-warning-minimum-level 4689 (if (< level-num (cdr (assq log-warning-minimum-level
4770 ;; misc junk ;; 4769 ;; misc junk ;;
4771 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 4770 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
4772 4771
4773 (defun emacs-name () 4772 (defun emacs-name ()
4774 "Return the printable name of this instance of Emacs." 4773 "Return the printable name of this instance of Emacs."
4775 (cond ((featurep 'infodock) "InfoDock") 4774 (cond ((featurep 'xemacs) "XEmacs")
4776 ((featurep 'xemacs) "XEmacs")
4777 (t "Emacs"))) 4775 (t "Emacs")))
4778 4776
4779 (defun debug-print-1 (&rest args) 4777 (defun debug-print-1 (&rest args)
4780 "Send a debugging-type string to standard output. 4778 "Send a debugging-type string to standard output.
4781 If the first argument is a string, it is considered to be a format 4779 If the first argument is a string, it is considered to be a format