Raymond Toy pushed to branch issue-415-add-package-local-nicknames at cmucl / cmucl

Commits:

2 changed files:

Changes:

  • src/code/package.lisp
    ... ... @@ -2019,7 +2019,7 @@
    2019 2019
     	(restart-case 
    
    2020 2020
     	    (error 'simple-package-error
    
    2021 2021
     		   :package pkg
    
    2022
    -		   :format-control (intl:gettext "~A as already a local nickname for the package ~A in ~A")
    
    2022
    +		   :format-control (intl:gettext "~A is already a local nickname for the package ~A in ~A")
    
    2023 2023
     		   :format-arguments (list local-nickname actual-pkg pkg))
    
    2024 2024
     	  (keep-old-nickname ()
    
    2025 2025
     	    :report (lambda (stream)
    

  • src/code/print.lisp
    ... ... @@ -697,7 +697,7 @@
    697 697
     	    ;; from a package other than its home package.
    
    698 698
     	    (unless (and accessible (eq symbol object))
    
    699 699
     	      ;; If the actual symbol package has a local nickname in
    
    700
    -	      ;; *package*, use that as the symbol name instead of the
    
    700
    +	      ;; *package*, use that as the package name instead of the
    
    701 701
     	      ;; actual symbol package name.
    
    702 702
     	      (let ((local-nicks (package-%local-nicknames *package*))
    
    703 703
     		    (pkg-name (package-name package)))