X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fdgnushack.el;h=48545eb2bb618d9ff20c603210780e9d7fe6e396;hb=8339220cc25db3fbdab4367d6252e596bddd9cb1;hp=9b2ef3f6630823d51277464e6a71432f883a896c;hpb=a19d6dbb828654bde8e6e8f27c165f4a365645bb;p=gnus diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index 9b2ef3f66..48545eb2b 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -1,6 +1,6 @@ ;;; dgnushack.el --- a hack to set the load path for byte-compiling ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, -;; 2004, 2005, 2006, 2007 +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen @@ -11,7 +11,7 @@ ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) +;; the Free Software Foundation; either version 3, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, @@ -62,7 +62,7 @@ (setq filename (byte-compiler-base-file-name filename)) (setq filename (file-name-sans-versions filename)) (setq filename (file-name-nondirectory filename)) - (if (memq system-type '(win32 w32 mswindows windows-nt)) + (if (eq system-type 'windows-nt) (setq filename (downcase filename))) (cond ((eq system-type 'vax-vms) (concat (substring filename 0 (string-match ";" filename)) "c")) @@ -80,69 +80,6 @@ ; (cons 'progn (cdr form))) ;(defalias 'byte-compile-file-form-defsubst 'byte-compile-file-form-defun) -(when (and (not (featurep 'xemacs)) - (= emacs-major-version 21) - (>= emacs-minor-version 3) - (condition-case code - (let ((byte-compile-error-on-warn t)) - (byte-optimize-form (quote (pop x)) t) - nil) - (error (string-match "called for effect" - (error-message-string code))))) - (defadvice byte-optimize-form-code-walker (around silence-warn-for-pop - (form for-effect) - activate) - "Silence the warning \"...called for effect\" for the `pop' form. -It is effective only when the `pop' macro is defined by cl.el rather -than subr.el." - (let (tmp) - (if (and (eq (car-safe form) 'car) - for-effect - (setq tmp (get 'car 'side-effect-free)) - (not byte-compile-delete-errors) - (not (eq tmp 'error-free)) - (eq (car-safe (cadr form)) 'prog1) - (let ((var (cadr (cadr form))) - (last (nth 2 (cadr form)))) - (and (symbolp var) - (null (nthcdr 3 (cadr form))) - (eq (car-safe last) 'setq) - (eq (cadr last) var) - (eq (car-safe (nth 2 last)) 'cdr) - (eq (cadr (nth 2 last)) var)))) - (progn - (put 'car 'side-effect-free 'error-free) - (unwind-protect - ad-do-it - (put 'car 'side-effect-free tmp))) - ad-do-it)))) - -(when (and (not (featurep 'xemacs)) - (byte-optimize-form - '(and (> 0 1) - (message "This should not appear in the byte-code.")) - t)) - (defadvice byte-optimize-form-code-walker - (around fix-bug-in-and/or-forms (form for-effect) activate) - "Optimize the rest of the and/or forms. -It has been fixed in XEmacs before releasing 21.4 and also has been -fixed in Emacs 22." - (if (and for-effect (memq (car-safe form) '(and or))) - (let ((fn (car form)) - (backwards (reverse (cdr form)))) - (while (and backwards - (null (setcar backwards - (byte-optimize-form (car backwards) t)))) - (setq backwards (cdr backwards))) - (if (and (cdr form) (null backwards)) - (byte-compile-log - " all subforms of %s called for effect; deleted" form)) - (when backwards - (setcdr backwards - (mapcar 'byte-optimize-form (cdr backwards)))) - (setq ad-return-value (cons fn (nreverse backwards)))) - ad-do-it))) - ;; Work around for an incompatibility (XEmacs 21.4 vs. 21.5), see the ;; following threads: ;; @@ -169,7 +106,7 @@ fixed in Emacs 22." (forward-sexp 1) (eolp))))) ;; The original `with-syntax-table' uses `copy-syntax-table' which - ;; doesn't seem to copy modified syntax entries in XEmacs 21.5. + ;; doesn't seem to copy modified syntax entries in old XEmacs 21.5. (defmacro with-syntax-table (syntab &rest body) "Evaluate BODY with the SYNTAB as the current syntax table." `(let ((stab (syntax-table))) @@ -186,7 +123,6 @@ fixed in Emacs 22." (defalias 'device-sound-enabled-p 'ignore) (defalias 'play-sound-file 'ignore) -(defalias 'nndb-request-article 'ignore) (defalias 'efs-re-read-dir 'ignore) (defalias 'ange-ftp-re-read-dir 'ignore) (defalias 'define-mail-user-agent 'ignore) @@ -195,6 +131,7 @@ fixed in Emacs 22." (unless (featurep 'xemacs) (defalias 'get-popup-menu-response 'ignore) (defalias 'event-object 'ignore) + (autoload 'netrc-credentials "netrc") (defalias 'x-defined-colors 'ignore) (defalias 'read-color 'ignore))) @@ -203,8 +140,14 @@ fixed in Emacs 22." (unless (fboundp 'defadvice) (autoload 'defadvice "advice" nil nil 'macro)) (autoload 'Info-directory "info" nil t) + (autoload 'Info-index "info" nil t) + (autoload 'Info-index-next "info" nil t) (autoload 'Info-menu "info" nil t) (autoload 'ad-add-advice "advice") + (unless (and (emacs-version>= 21 5) + (not (featurep 'sxemacs))) + ;; calendar/auto-autoloads.el provides it. + (autoload 'add-to-invisibility-spec "dummy")) (autoload 'annotations-at "annotations") (autoload 'apropos "apropos" nil t) (autoload 'apropos-command "apropos" nil t) @@ -217,6 +160,7 @@ fixed in Emacs 22." (autoload 'customize-save-variable "cus-edit" nil t) (autoload 'customize-set-variable "cus-edit" nil t) (autoload 'customize-variable "cus-edit" nil t) + (autoload 'debug "debug" nil t) (if (featurep 'mule) (unless (locate-library "mule-ccl") (autoload 'define-ccl-program "ccl" nil nil 'macro)) @@ -224,13 +168,19 @@ fixed in Emacs 22." (autoload 'delete-annotation "annotations") (autoload 'dolist "cl-macs" nil nil 'macro) (autoload 'enriched-decode "enriched") + (autoload 'eudc-expand-inline "eudc" nil t) (autoload 'executable-find "executable") (autoload 'font-lock-fontify-buffer "font-lock" nil t) + (when (and (emacs-version>= 21 5) + (not (featurep 'sxemacs))) + (autoload 'get-display-table "disp-table") + (autoload 'put-display-table "disp-table")) (autoload 'info "info" nil t) (autoload 'mail-extract-address-components "mail-extr") (autoload 'mail-fetch-field "mail-utils") (autoload 'make-annotation "annotations") (autoload 'make-display-table "disp-table") + (autoload 'pgg-snarf-keys-region "pgg" nil t) (autoload 'pp "pp") (autoload 'ps-despool "ps-print" nil t) (autoload 'ps-spool-buffer "ps-print" nil t) @@ -246,6 +196,7 @@ fixed in Emacs 22." (autoload 'smtpmail-send-it "smtpmail") (autoload 'sort-numeric-fields "sort" nil t) (autoload 'sort-subr "sort") + (autoload 'thing-at-point "thingatpt") (autoload 'toggle-truncate-lines "view-less" nil t) (autoload 'trace-function-background "trace" nil t) (autoload 'unmorse-region "morse" nil t) @@ -265,6 +216,24 @@ fixed in Emacs 22." (defalias 'replace-highlight 'ignore) (defalias 'w3-coding-system-for-mime-charset 'ignore))) +(defun dgnushack-emacs-compile-defcustom-p () + "Return non-nil if Emacs byte compiles `defcustom' forms. +Those Emacsen will warn against undefined variables and functions used +in `defcustom' forms." + (let ((outbuf (with-temp-buffer + (insert "(defcustom foo (1+ (random)) \"\" :group 'emacs)\n") + (byte-compile-from-buffer (current-buffer) "foo.el")))) + (when outbuf + (prog1 + (with-current-buffer outbuf + (goto-char (point-min)) + (search-forward " 'foo '(byte-code " nil t)) + (kill-buffer outbuf))))) + +(when (dgnushack-emacs-compile-defcustom-p) + (maybe-fbind '(defined-colors face-attribute)) + (maybe-bind '(idna-program installation-directory))) + (defun dgnushack-compile-verbosely () "Call dgnushack-compile with warnings ENABLED. If you are compiling patches to gnus, you should consider modifying make.bat to call @@ -276,7 +245,7 @@ dgnushack-compile." ;;(setq byte-compile-dynamic t) (unless warn (setq byte-compile-warnings - '(free-vars unresolved callargs redefine))) + '(free-vars unresolved callargs redefine suspicious))) (let ((files (directory-files srcdir nil "^[^=].*\\.el$")) ;;(byte-compile-generate-call-tree t) file elc) @@ -284,7 +253,7 @@ dgnushack-compile." ;; installed. (when (featurep 'xemacs) (setq gnus-xmas-glyph-directory "dummy")) - (dolist (file '("dgnushack.el" "lpath.el")) + (dolist (file '(".dir-locals.el" "dgnushack.el" "lpath.el")) (setq files (delete file files))) (when (featurep 'base64) (setq files (delete "base64.el" files))) @@ -292,9 +261,11 @@ dgnushack-compile." (require 'w3-parse) (error (message "No w3: %s %s" (cadr code) (or (locate-library "w3-parse") "")) - (dolist (file '("nnultimate.el" "webmail.el" "nnwfm.el")) + (dolist (file '("webmail.el" "nnwfm.el")) (setq files (delete file files))))) (condition-case code + ;; Under XEmacs 21.4 this loads easy-mmode.elc that provides + ;; the Emacs functions `propertize' and `replace-regexp-in-string'. (require 'mh-e) (error (message "No mh-e: %s %s" (cadr code) (or (locate-library "mh-e") "")) @@ -334,7 +305,7 @@ dgnushack-compile." (expand-file-name "auto-autoloads.el") (expand-file-name "gnus-load.el"))) -(defvar dgnushack-cus-load-file +(defvar dgnushack-cus-load-file (if (featurep 'xemacs) (expand-file-name "custom-load.el") (expand-file-name "cus-load.el"))) @@ -342,29 +313,22 @@ dgnushack-compile." (defun dgnushack-make-cus-load () (load "cus-dep") (let ((cusload-base-file dgnushack-cus-load-file)) - (if (fboundp 'custom-make-dependencies) - (custom-make-dependencies) - (Custom-make-dependencies)) + (defadvice directory-files (after exclude-dir-locals activate) + "Exclude .dir-locals.el file." + (dolist (file ad-return-value) + (if (string-match "\\(?:\\`\\|/\\)\\.dir-locals\\.el\\'" file) + (setq ad-return-value (delete file ad-return-value))))) + (unwind-protect + (if (fboundp 'custom-make-dependencies) + (custom-make-dependencies) + (Custom-make-dependencies)) + (ad-unadvise 'directory-files)) (when (featurep 'xemacs) (message "Compiling %s..." dgnushack-cus-load-file) (byte-compile-file dgnushack-cus-load-file)))) (defun dgnushack-make-auto-load () (require 'autoload) - (unless (make-autoload '(define-derived-mode child parent name - "docstring" body) - "file") - (defadvice make-autoload (around handle-define-derived-mode activate) - "Handle `define-derived-mode'." - (if (eq (car-safe (ad-get-arg 0)) 'define-derived-mode) - (setq ad-return-value - (list 'autoload - (list 'quote (nth 1 (ad-get-arg 0))) - (ad-get-arg 1) - (nth 4 (ad-get-arg 0)) - t nil)) - ad-do-it)) - (put 'define-derived-mode 'doc-string-elt 3)) (let ((generated-autoload-file dgnushack-gnus-load-file) (make-backup-files nil) (autoload-package-name "gnus")) @@ -373,7 +337,14 @@ dgnushack-compile." (delete-file generated-autoload-file)) (with-temp-file generated-autoload-file (insert ?\014))) - (batch-update-autoloads))) + (defadvice directory-files (after exclude-dir-locals activate) + "Exclude .dir-locals.el file." + (dolist (file ad-return-value) + (if (string-match "\\(?:\\`\\|/\\)\\.dir-locals\\.el\\'" file) + (setq ad-return-value (delete file ad-return-value))))) + (unwind-protect + (batch-update-autoloads) + (ad-unadvise 'directory-files)))) (defun dgnushack-make-load () (unless (featurep 'xemacs) @@ -519,5 +490,3 @@ or remove them using `make remove-installed-shadows'.\n\n")))))))) (setq path (cdr path)))))) ;;; dgnushack.el ends here - -;;; arch-tag: 579f585a-24eb-4e1c-8d34-4808e11b68f2