mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-19 12:20:17 -08:00
Also, simplify some time-related Lisp timestamp code while we’re in the neighborhood. * lisp/battery.el (battery-linux-proc-acpi) (battery-linux-sysfs, battery-upower, battery-bsd-apm): * lisp/calendar/timeclock.el (timeclock-seconds-to-string) (timeclock-log, timeclock-last-period) (timeclock-entry-length, timeclock-entry-list-span) (timeclock-find-discrep, timeclock-generate-report): * lisp/cedet/ede/detect.el (ede-detect-qtest): * lisp/completion.el (cmpl-hours-since-origin): * lisp/ecomplete.el (ecomplete-decay-1): * lisp/emacs-lisp/ert.el (ert--results-update-stats-display) (ert--results-update-stats-display-maybe): * lisp/emacs-lisp/timer-list.el (list-timers): * lisp/emacs-lisp/timer.el (timer-until) (timer-event-handler): * lisp/erc/erc-backend.el (erc-server-send-ping) (erc-server-send-queue, erc-handle-parsed-server-response) (erc-handle-unknown-server-response): * lisp/erc/erc-track.el (erc-buffer-visible): * lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p) (erc-cmd-PING, erc-send-current-line): * lisp/eshell/em-pred.el (eshell-pred-file-time): * lisp/eshell/em-unix.el (eshell-show-elapsed-time): * lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp): * lisp/gnus/gnus-int.el (gnus-backend-trace): * lisp/gnus/gnus-sum.el (gnus-user-date): * lisp/gnus/mail-source.el (mail-source-delete-crash-box): * lisp/gnus/nnmaildir.el (nnmaildir--scan): * lisp/ibuf-ext.el (ibuffer-mark-old-buffers): * lisp/gnus/nnmaildir.el (nnmaildir--scan): * lisp/mouse.el (mouse--down-1-maybe-follows-link) (mouse--click-1-maybe-follows-link): * lisp/mpc.el (mpc--faster-toggle): * lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE) (rcirc-sentinel): * lisp/net/tramp-cache.el (tramp-get-file-property): * lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p) (tramp-maybe-open-connection): * lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection): * lisp/org/org-clock.el (org-clock-resolve): (org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum): * lisp/org/org-timer.el (org-timer-start) (org-timer-pause-or-continue, org-timer-seconds): * lisp/org/org.el (org-evaluate-time-range): * lisp/org/ox-publish.el (org-publish-cache-ctime-of-src): * lisp/pixel-scroll.el (pixel-scroll-in-rush-p): * lisp/play/hanoi.el (hanoi-move-ring): * lisp/proced.el (proced-format-time): * lisp/progmodes/cpp.el (cpp-progress-message): * lisp/progmodes/flymake.el (flymake--handle-report): * lisp/progmodes/js.el (js--wait-for-matching-output): * lisp/subr.el (progress-reporter-do-update): * lisp/term/xterm.el (xterm--read-event-for-query): * lisp/time.el (display-time-update, emacs-uptime): * lisp/tooltip.el (tooltip-delay): * lisp/url/url-cookie.el (url-cookie-parse-file-netscape): * lisp/url/url-queue.el (url-queue-prune-old-entries): * lisp/url/url.el (url-retrieve-synchronously): * lisp/xt-mouse.el (xterm-mouse-event): Avoid double-rounding of time-related values. Simplify. * lisp/calendar/icalendar.el (icalendar--decode-isodatetime): When hoping for the best (unlikely), use a better decoded time. (icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time. * lisp/calendar/timeclock.el (timeclock-when-to-leave): * lisp/cedet/ede/detect.el (ede-detect-qtest): * lisp/desktop.el (desktop-create-buffer): * lisp/emacs-lisp/benchmark.el (benchmark-elapse): * lisp/gnus/gnus-art.el (article-lapsed-string): * lisp/gnus/gnus-group.el (gnus-group-timestamp-delta): * lisp/gnus/nnmail.el (nnmail-expired-article-p): * lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles): * lisp/nxml/rng-maint.el (rng-time-function): * lisp/org/org-clock.el (org-clock-get-clocked-time) (org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle): * lisp/org/org-habit.el (org-habit-insert-consistency-graphs): * lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info) (vhdl-fix-case-region-1): Use time-since instead of open-coding most of it. * lisp/erc/erc-dcc.el (erc-dcc-get-sentinel): * lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt): Now obsolete. All uses changed. (erc-time-diff): Accept all Lisp time values. All uses changed. * lisp/gnus/gnus-demon.el (gnus-demon-idle-since): * lisp/gnus/gnus-score.el (gnus-score-headers): * lisp/gnus/nneething.el (nneething-make-head): * lisp/gnus/nnheader.el (nnheader-message-maybe): * lisp/gnus/nnimap.el (nnimap-keepalive): * lisp/image.el (image-animate-timeout): * lisp/mail/feedmail.el (feedmail-rfc822-date): * lisp/net/imap.el (imap-wait-for-tag): * lisp/net/newst-backend.el (newsticker--image-get): * lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333): * lisp/obsolete/xesam.el (xesam-refresh-entry): * lisp/org/org-agenda.el (org-agenda-show-clocking-issues) (org-agenda-check-clock-gap, org-agenda-to-appt): * lisp/org/org-capture.el (org-capture-set-target-location): * lisp/org/org-clock.el (org-clock-resolve-clock) (org-clocktable-steps): * lisp/org/org-colview.el (org-columns-edit-value) (org-columns, org-agenda-columns): * lisp/org/org-duration.el (org-duration-from-minutes): * lisp/org/org-element.el (org-element-cache-sync-duration) (org-element-cache-sync-break) (org-element--cache-interrupt-p, org-element--cache-sync): * lisp/org/org-habit.el (org-habit-get-faces) * lisp/org/org-indent.el (org-indent-add-properties): * lisp/org/org-table.el (org-table-sum): * lisp/org/org-timer.el (org-timer-show-remaining-time) (org-timer-set-timer): * lisp/org/org.el (org-babel-load-file, org-today) (org-auto-repeat-maybe, org-2ft, org-time-stamp) (org-read-date-analyze, org-time-stamp-to-now) (org-small-year-to-year, org-goto-calendar): * lisp/org/ox.el (org-export-insert-default-template): * lisp/ses.el (ses--time-check): * lisp/type-break.el (type-break-time-warning) (type-break-statistics, type-break-demo-boring): * lisp/url/url-cache.el (url-cache-expired) (url-cache-prune-cache): * lisp/vc/vc-git.el (vc-git-stash-snapshot): * lisp/erc/erc-match.el (erc-log-matches-come-back): Simplify.
209 lines
6.9 KiB
EmacsLisp
209 lines
6.9 KiB
EmacsLisp
;;; ede/detect.el --- EDE project detection and file associations
|
|
|
|
;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric M. Ludlam <eric@siege-engine.com>
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; 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 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
;;
|
|
;; Project detection for EDE;
|
|
;;
|
|
;; Detection comes in multiple forms:
|
|
;;
|
|
;; `ede-detect-scan-directory-for-project' -
|
|
;; Scan for a project via the file system.
|
|
;; `ede-detect-directory-for-project' -
|
|
;; Check our file cache for a project. If that fails, use
|
|
;; the scan fcn above.
|
|
|
|
;;; Code:
|
|
|
|
(require 'ede/auto) ;; Autoload settings.
|
|
|
|
(when (or (<= emacs-major-version 23)
|
|
;; predicate as name added in Emacs 24.2
|
|
(and (= emacs-major-version 24)
|
|
(< emacs-minor-version 2)))
|
|
(message "Loading CEDET fallback autoload library.")
|
|
(require 'cedet/dominate
|
|
(expand-file-name "../../../etc/fallback-libraries/dominate.el"
|
|
(file-name-directory load-file-name))))
|
|
|
|
|
|
;;; BASIC PROJECT SCAN
|
|
;;
|
|
(defun ede--detect-stop-scan-p (dir)
|
|
"Return non-nil if we need to stop scanning upward in DIR."
|
|
;;(let ((stop
|
|
(file-exists-p (expand-file-name ".ede_stop_scan" dir)))
|
|
;;)
|
|
;;(when stop
|
|
;;(message "Stop Scan at %s" dir))
|
|
;;stop))
|
|
|
|
(defvar ede--detect-found-project nil
|
|
"When searching for a project, temporarily save that file.")
|
|
|
|
(defun ede--detect-ldf-predicate (dir)
|
|
"Non-nil if DIR contain any known EDE project types."
|
|
(if (ede--detect-stop-scan-p dir)
|
|
(throw 'stopscan nil)
|
|
(let ((types ede-project-class-files))
|
|
;; Loop over all types, loading in the first type that we find.
|
|
(while (and types (not ede--detect-found-project))
|
|
(if (ede-auto-detect-in-dir (car types) dir)
|
|
(progn
|
|
;; We found one!
|
|
(setq ede--detect-found-project (car types)))
|
|
(setq types (cdr types)))
|
|
)
|
|
ede--detect-found-project)))
|
|
|
|
(defun ede--detect-scan-directory-for-project (directory)
|
|
"Detect an EDE project for the current DIRECTORY by scanning.
|
|
This function ALWAYS scans files and directories and DOES NOT
|
|
use any file caches.
|
|
Return a cons cell:
|
|
( ROOTDIR . PROJECT-AUTOLOAD)"
|
|
(let* ((ede--detect-found-project nil)
|
|
(root
|
|
(catch 'stopscan
|
|
(locate-dominating-file directory
|
|
'ede--detect-ldf-predicate))))
|
|
(when root
|
|
(cons root ede--detect-found-project))))
|
|
|
|
;;; Root Only project detect
|
|
;;
|
|
;; For projects that only have a detectable ROOT file, but may in fact
|
|
;; contain a generic file such as a Makefile, we need to do a second scan
|
|
;; to make sure we don't miss-match.
|
|
(defun ede--detect-ldf-rootonly-predicate (dir)
|
|
"Non-nil if DIR contain any known EDE project types."
|
|
(if (ede--detect-stop-scan-p dir)
|
|
(throw 'stopscan nil)
|
|
(let ((types ede-project-class-files))
|
|
;; Loop over all types, loading in the first type that we find.
|
|
(while (and types (not ede--detect-found-project))
|
|
(if (and
|
|
(oref (car types) root-only)
|
|
(ede-auto-detect-in-dir (car types) dir))
|
|
(progn
|
|
;; We found one!
|
|
(setq ede--detect-found-project (car types)))
|
|
(setq types (cdr types)))
|
|
)
|
|
ede--detect-found-project)))
|
|
|
|
(defun ede--detect-scan-directory-for-rootonly-project (directory)
|
|
"Detect an EDE project for the current DIRECTORY by scanning.
|
|
This function ALWAYS scans files and directories and DOES NOT
|
|
use any file caches.
|
|
Return a cons cell:
|
|
( ROOTDIR . PROJECT-AUTOLOAD)"
|
|
(let* ((ede--detect-found-project nil)
|
|
(root
|
|
(catch 'stopscan
|
|
(locate-dominating-file directory
|
|
'ede--detect-ldf-rootonly-predicate))))
|
|
(when root
|
|
(cons root ede--detect-found-project))))
|
|
|
|
|
|
;;; NESTED PROJECT SCAN
|
|
;;
|
|
;; For projects that can have their dominating file exist in all their
|
|
;; sub-directories as well.
|
|
|
|
(defvar ede--detect-nomatch-auto nil
|
|
"An ede autoload that needs to be un-matched.")
|
|
|
|
(defun ede--detect-ldf-root-predicate (dir)
|
|
"Non-nil if DIR no longer match `ede--detect-nomatch-auto'."
|
|
(or (ede--detect-stop-scan-p dir)
|
|
;; To know if DIR is at the top, we need to look just above
|
|
;; to see if there is a match.
|
|
(let ((updir (file-name-directory (directory-file-name dir))))
|
|
(if (equal updir dir)
|
|
;; If it didn't change, then obviously this must be the top.
|
|
t
|
|
;; If it is different, check updir for the file.
|
|
(not (ede-auto-detect-in-dir ede--detect-nomatch-auto updir))))))
|
|
|
|
(defun ede--detect-scan-directory-for-project-root (directory auto)
|
|
"If DIRECTORY has already been detected with AUTO, find the root.
|
|
Some projects have their dominating file in all their directories, such
|
|
as Project.ede. In that case we will detect quickly, but then need
|
|
to scan upward to find the topmost occurrence of that file."
|
|
(let* ((ede--detect-nomatch-auto auto)
|
|
(root (locate-dominating-file directory
|
|
'ede--detect-ldf-root-predicate)))
|
|
root))
|
|
|
|
;;; TOP LEVEL SCAN
|
|
;;
|
|
;; This function for combining the above scans.
|
|
(defun ede-detect-directory-for-project (directory)
|
|
"Detect an EDE project for the current DIRECTORY.
|
|
Scan the filesystem for a project.
|
|
Return a cons cell:
|
|
( ROOTDIR . PROJECT-AUTOLOAD)"
|
|
(let* ((scan (ede--detect-scan-directory-for-project directory))
|
|
(root (car scan))
|
|
(auto (cdr scan)))
|
|
(when scan
|
|
;; If what we found is already a root-only project, return it.
|
|
(if (oref auto root-only)
|
|
scan
|
|
|
|
;; If what we found is a generic project, check to make sure we aren't
|
|
;; in some other kind of root project.
|
|
(if (oref auto generic-p)
|
|
(let ((moreroot (ede--detect-scan-directory-for-rootonly-project root)))
|
|
;; If we found a rootier project, return that.
|
|
(if moreroot
|
|
moreroot
|
|
|
|
;; If we didn't find a root from the generic project, then
|
|
;; we need to rescan upward.
|
|
(cons (ede--detect-scan-directory-for-project-root root auto) auto)))
|
|
|
|
;; Non-generic non-root projects also need to rescan upward.
|
|
(cons (ede--detect-scan-directory-for-project-root root auto) auto)))
|
|
|
|
)))
|
|
|
|
;;; TEST
|
|
;;
|
|
;; A quick interactive testing fcn.
|
|
(defun ede-detect-qtest ()
|
|
"Run a quick test for autodetecting on BUFFER."
|
|
(interactive)
|
|
(let ((start (current-time))
|
|
(ans (ede-detect-directory-for-project default-directory)))
|
|
(if ans
|
|
(message "Project found in %d sec @ %s of type %s"
|
|
(encode-time (time-since start) 'integer)
|
|
(car ans)
|
|
(eieio-object-name-string (cdr ans)))
|
|
(message "No Project found.") )))
|
|
|
|
|
|
(provide 'ede/detect)
|
|
|
|
;;; ede/detect.el ends here
|