mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-26

Browse source 
9ad0f1d15c Fix deprecation warning
7946445962 Make all NS drawing be done from drawRect
41fa88b99b ; Fix some doc typos
This commit is contained in:
Alan Third 2018-09-29 17:08:43 +01:00
commit 6217746dd6
4 changed files with 403 additions and 404 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/cedet/ede/project-am.el
View file

@ -532,7 +532,7 @@ DIR is the directory to apply to new targets."
(project-rescan tmp) (project-rescan tmp)
(setq ntargets (cons tmp ntargets))) (setq ntargets (cons tmp ntargets)))
(makefile-macro-file-list macro)) (makefile-macro-file-list macro))
;; Non-indirect will have a target whos sources ;; Non-indirect will have a target whose sources
;; are actual files, not names of other targets. ;; are actual files, not names of other targets.
(let ((files (makefile-macro-file-list macro))) (let ((files (makefile-macro-file-list macro)))
(when files (when files

2
lisp/cedet/semantic/db-ref.el
View file

@ -80,7 +80,7 @@ Abstract tables would be difficult to reference."
(cl-defmethod semanticdb-check-references ((dbt semanticdb-table)) (cl-defmethod semanticdb-check-references ((dbt semanticdb-table))
"Check and cleanup references in the database DBT. "Check and cleanup references in the database DBT.
Any reference to a file that cannot be found, or whos file no longer Any reference to a file that cannot be found, or whose file no longer
refers to DBT will be removed." refers to DBT will be removed."
(let ((refs (oref dbt db-refs)) (let ((refs (oref dbt db-refs))
(myexpr (concat "\\<" (oref dbt file))) (myexpr (concat "\\<" (oref dbt file)))

2
lisp/cedet/semantic/scope.el
View file

@ -140,7 +140,7 @@ Saves scoping information between runs of the analyzer.")
(cl-defmethod semantic-scope-set-typecache ((cache semantic-scope-cache) (cl-defmethod semantic-scope-set-typecache ((cache semantic-scope-cache)
types-in-scope) types-in-scope)
"Set the :typescope property on CACHE to some types. "Set the :typescope property on CACHE to some types.
TYPES-IN-SCOPE is a list of type tags whos members are TYPES-IN-SCOPE is a list of type tags whose members are
currently in scope. For each type in TYPES-IN-SCOPE, currently in scope. For each type in TYPES-IN-SCOPE,
add those members to the types list. add those members to the types list.
If nil, then the typescope is reset." If nil, then the typescope is reset."

801
src/nsterm.m
View file

File diff suppressed because it is too large Load diff